From 19af88738bec80a8d903f921957aaf96f28f02ba Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 3 Nov 2015 14:05:20 +0100 Subject: [PATCH] remove Jet from names of classes in tests: phase 2 --- .../tests/CodegenTestsOnAndroidGenerator.java | 6 +- .../DiagnosticsWithJava8TestGenerated.java | 36 +- ...BlackBoxWithJava8CodegenTestGenerated.java | 28 +- .../AbstractCompilerLightClassTest.java | 8 +- .../CompilerLightClassTestGenerated.java | 74 +- .../asJava/LightClassAnnotationsTest.java | 6 +- .../kotlin/asJava/LightClassTestCommon.kt | 4 +- .../kotlin/cfg/AbstractPseudocodeTest.java | 10 +- .../kotlin/cfg/CFGraphToDotFilePrinter.java | 4 +- .../kotlin/cfg/ControlFlowTestGenerated.java | 222 +- .../kotlin/cfg/DataFlowTestGenerated.java | 50 +- .../kotlin/cfg/PseudoValueTestGenerated.java | 270 +- .../kotlin/checkers/CheckerTestUtilTest.java | 6 +- .../checkers/DiagnosticsTestGenerated.java | 5990 ++++++++--------- ...sStdLibAndBackendCompilationGenerated.java | 18 +- .../DiagnosticsTestWithJsStdLibGenerated.java | 194 +- .../DiagnosticsTestWithStdLibGenerated.java | 378 +- .../KotlinMultiFileTestWithWithJava.java | 18 +- .../cli/AbstractKotlincExecutableTest.java | 4 +- .../org/jetbrains/kotlin/cli/CliBaseTest.java | 4 +- .../cli/KotlincExecutableTestGenerated.java | 118 +- .../kotlin/code/CodeConformanceTest.kt | 3 +- .../codegen/AbstractBytecodeListingTest.kt | 4 +- .../AbstractCheckLocalVariablesTableTest.java | 8 +- .../codegen/AbstractLineNumberTest.java | 14 +- ...AbstractTopLevelMembersInvocationTest.java | 8 +- .../codegen/BytecodeListingTestGenerated.java | 22 +- .../BytecodeTextMultifileTestGenerated.java | 12 +- .../codegen/BytecodeTextTestGenerated.java | 320 +- ...CheckLocalVariablesTableTestGenerated.java | 24 +- .../kotlin/codegen/CodegenTestCase.java | 10 +- .../kotlin/codegen/CodegenTestFiles.java | 10 +- .../kotlin/codegen/CodegenTestUtil.java | 10 +- .../GenerateNotNullAssertionsTest.java | 4 +- .../kotlin/codegen/JUnitUsageGenTest.java | 4 +- .../codegen/LineNumberTestGenerated.java | 80 +- .../codegen/ScriptCodegenTestGenerated.java | 36 +- .../jetbrains/kotlin/codegen/TestlibTest.java | 10 +- ...opLevelMembersInvocationTestGenerated.java | 18 +- ...faultArgumentsReflectionTestGenerated.java | 28 +- .../codegen/flags/AbstractWriteFlagsTest.java | 6 +- .../flags/WriteFlagsTestGenerated.java | 278 +- .../AbstractBlackBoxCodegenTest.java | 14 +- ...ackBoxAgainstJavaCodegenTestGenerated.java | 320 +- .../BlackBoxCodegenTestGenerated.java | 2604 +++---- .../BlackBoxInlineCodegenTestGenerated.java | 434 +- ...BlackBoxMultiFileCodegenTestGenerated.java | 40 +- .../BlackBoxWithJavaCodegenTestGenerated.java | 202 +- ...lackBoxWithStdlibCodegenTestGenerated.java | 1562 ++--- .../kotlin/daemon/CompilerDaemonTest.kt | 6 +- .../kotlin/integration/AntTaskJsTest.java | 4 +- .../integration/AntTaskTestGenerated.java | 36 +- .../kotlin/integration/CompilerSmokeTest.java | 4 +- .../KotlinIntegrationTestBase.java | 4 +- .../AbstractCompileJavaAgainstKotlinTest.java | 2 +- ...bstractCompileKotlinAgainstKotlinTest.java | 16 +- .../jvm/compiler/AbstractLoadJavaTest.java | 12 +- .../compiler/AbstractWriteSignatureTest.kt | 6 +- .../AndroidSdkAnnotationsValidityTest.java | 8 +- ...kBoxMultifileClassKotlinTestGenerated.java | 12 +- .../jvm/compiler/CompileEnvironmentTest.java | 4 +- ...CompileJavaAgainstKotlinTestGenerated.java | 196 +- ...ompileKotlinAgainstCustomBinariesTest.java | 20 +- ...otlinAgainstInlineKotlinTestGenerated.java | 434 +- ...mpileKotlinAgainstKotlinTestGenerated.java | 58 +- ...inAgainstMultifileKotlinTestGenerated.java | 12 +- .../compiler/JdkAnnotationsValidityTest.java | 8 +- .../jvm/compiler/KotlinClassFinderTest.kt | 10 +- .../jvm/compiler/LoadDescriptorUtil.java | 35 +- .../jvm/compiler/LoadJavaTestGenerated.java | 1666 ++--- .../LoadKotlinWithTypeTableTestGenerated.java | 982 +-- .../MultiModuleJavaAnalysisCustomTest.kt | 4 +- .../compiler/WriteSignatureTestGenerated.java | 112 +- ...solveDescriptorsFromExternalLibraries.java | 10 +- .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 8 +- ...mRuntimeDescriptorLoaderTestGenerated.java | 1352 ++-- .../xml/AbstractModuleXmlParserTest.java | 4 +- .../xml/ModuleXmlParserTestGenerated.java | 20 +- .../kotlin/parsing/ParsingTestGenerated.java | 944 +-- .../AbstractDescriptorRendererTest.kt | 4 +- ...ctionDescriptorInExpressionRendererTest.kt | 4 +- .../DescriptorRendererTestGenerated.java | 30 +- ...ptorInExpressionRendererTestGenerated.java | 16 +- .../repl/AbstractReplInterpreterTest.kt | 4 +- .../repl/ReplInterpreterTestGenerated.java | 82 +- .../kotlin/resolve/AbstractResolveTest.java | 4 +- .../resolve/ExtensibleResolveTestCase.java | 10 +- .../kotlin/resolve/ResolveTestGenerated.java | 158 +- ...stractAnnotationDescriptorResolveTest.java | 14 +- .../AbstractAnnotationParameterTest.kt | 4 +- .../AnnotationParameterTestGenerated.java | 90 +- .../calls/AbstractResolvedCallsTest.kt | 10 +- .../calls/ResolvedCallsTestGenerated.java | 190 +- ...structorDelegationCallsTestsGenerated.java | 46 +- ...bstractCompileTimeConstantEvaluatorTest.kt | 4 +- ...ileTimeConstantEvaluatorTestGenerated.java | 66 +- .../AbstractConstraintSystemTest.kt | 12 +- .../ConstraintSystemTestData.kt | 6 +- .../ConstraintSystemTestGenerated.java | 294 +- .../CapturedTypeApproximationTest.kt | 10 +- .../jetbrains/kotlin/scripts/ScriptTest.java | 4 +- .../AbstractLocalClassProtoTest.kt | 4 +- .../LocalClassProtoTestGenerated.java | 18 +- .../builtins/BuiltInsSerializerTest.kt | 4 +- .../builtins/LoadBuiltinsTest.java | 4 +- .../js/KotlinJavascriptSerializerTest.kt | 4 +- .../kotlin/test/KotlinLiteFixture.java | 6 +- .../KotlinTestWithEnvironmentManagement.java | 2 +- .../kotlin/test/MockLibraryUtil.java | 8 +- .../kotlin/test/TestCaseWithTmpdir.java | 2 +- .../util/RecursiveDescriptorComparator.java | 4 +- .../RecursiveDescriptorProcessorTest.java | 8 +- .../types/DefaultModalityModifiersTest.java | 4 +- .../types/TypeBindingTestGenerated.java | 86 +- .../kotlin/types/TypeSubstitutorTest.java | 5 +- .../kotlin/types/TypeUnifierTest.java | 10 +- .../kotlin/generators/tests/GenerateTests.kt | 62 +- .../tests/generator/SimpleTestClassModel.java | 8 +- .../generator/SimpleTestMethodModel.java | 8 +- .../tests/generator/SingleClassTestModel.java | 8 +- .../tests/generator/TestGenerator.java | 6 +- .../evaluate/GenerateOperationsMapTest.kt | 4 +- .../ProtoBufCompareConsistencyTest.kt | 6 +- ...tractCompiledKotlinInJavaCompletionTest.kt | 2 +- .../test/AbstractJSBasicCompletionTest.java | 4 +- .../test/AbstractJvmBasicCompletionTest.java | 6 +- .../test/AbstractJvmSmartCompletionTest.java | 6 +- .../AbstractJvmWithLibBasicCompletionTest.kt | 2 +- .../test/AbstractKeywordCompletionTest.kt | 6 +- ...bstractKotlinSourceInJavaCompletionTest.kt | 2 +- ...edKotlinInJavaCompletionTestGenerated.java | 58 +- .../completion/test/CompletionTestUtil.kt | 4 +- .../test/JSBasicCompletionTestGenerated.java | 754 +-- .../test/JvmBasicCompletionTestGenerated.java | 804 +-- .../test/JvmSmartCompletionTestGenerated.java | 530 +- ...vmWithLibBasicCompletionTestGenerated.java | 20 +- .../test/KDocCompletionTestGenerated.java | 22 +- .../test/KeywordCompletionTestGenerated.java | 166 +- .../test/KotlinCompletionTestCase.java | 6 +- .../KotlinFixtureCompletionBaseTestCase.kt | 4 +- ...inSourceInJavaCompletionTestGenerated.java | 58 +- ...tiFileJvmBasicCompletionTestGenerated.java | 110 +- ...MultiFileSmartCompletionTestGenerated.java | 38 +- .../AbstractCompletionHandlerTests.kt | 4 +- .../BasicCompletionHandlerTestGenerated.java | 198 +- .../CompletionCharFilterTestGenerated.java | 60 +- .../handlers/CompletionHandlerTestBase.kt | 8 +- ...KeywordCompletionHandlerTestGenerated.java | 48 +- .../SmartCompletionHandlerTestGenerated.java | 282 +- .../weighers/AbstractCompletionWeigherTest.kt | 14 +- .../BasicCompletionWeigherTestGenerated.java | 88 +- .../SmartCompletionWeigherTestGenerated.java | 70 +- .../JdkAndMockLibraryProjectDescriptor.java | 3 +- .../idea/test/KotlinCodeInsightTestCase.java | 6 +- .../KotlinLightCodeInsightFixtureTestCase.kt | 8 +- ...LightPlatformCodeInsightFixtureTestCase.kt | 6 +- .../idea/test/KotlinMultiFileTestCase.kt | 6 +- .../idea/test/KotlinStdJSProjectDescriptor.kt | 2 +- .../kotlin/idea/test/PluginTestCaseBase.java | 4 +- .../ProjectDescriptorWithStdlibSources.java | 4 +- .../jetbrains/kotlin/idea/test/testUtils.kt | 2 +- .../jetbrains/kotlin/AbstractImportsTest.kt | 14 +- .../kotlin/DataFlowValueRenderingTest.kt | 8 +- .../DataFlowValueRenderingTestGenerated.java | 24 +- .../asJava/KotlinLightClassInheritorTest.kt | 8 +- .../AbstractJavaAgainstKotlinCheckerTest.java | 4 +- .../checkers/AbstractJsCheckerTest.java | 4 +- .../checkers/AbstractPsiCheckerTest.java | 4 +- ...nstKotlinBinariesCheckerTestGenerated.java | 30 +- ...ainstKotlinSourceCheckerTestGenerated.java | 34 +- .../checkers/JsCheckerTestGenerated.java | 12 +- .../checkers/PsiCheckerTestGenerated.java | 240 +- .../findUsages/AbstractFindUsagesTest.java | 8 +- ...AbstractKotlinFindUsagesWithLibraryTest.kt | 2 +- .../findUsages/FindUsagesTestGenerated.java | 498 +- ...linFindUsagesWithLibraryTestGenerated.java | 46 +- .../formatter/FormatterTestGenerated.java | 310 +- .../TypingIndentationTestBaseGenerated.java | 60 +- .../kotlin/idea/AbstractCopyPasteTest.kt | 4 +- .../idea/AbstractExpressionSelectionTest.java | 4 +- .../idea/AbstractSmartSelectionTest.java | 4 +- .../ExpressionSelectionTestGenerated.java | 12 +- .../idea/KotlinDaemonAnalyzerTestCase.java | 6 +- .../idea/KotlinHierarchyViewTestBase.java | 6 +- .../idea/KotlinLightQuickFixTestCase.java | 6 +- .../kotlin/idea/RegisteredFindersTest.kt | 4 +- .../kotlin/idea/ResolveElementCacheTest.kt | 8 +- .../idea/SmartSelectionTestGenerated.java | 22 +- .../kotlin/idea/WordSelectionTest.java | 8 +- .../AbstractGotoTestOrCodeActionTest.kt | 12 +- .../GotoTestOrCodeActionTestGenerated.java | 14 +- .../resolve/AbstractIdeLightClassTest.kt | 8 +- .../HighlightingWithDependentLibrariesTest.kt | 8 +- .../resolve/IdeLightClassTestGenerated.java | 66 +- .../AbstractInsertImportOnPasteTest.kt | 6 +- .../codeInsight/AbstractInspectionTest.kt | 8 +- .../codeInsight/AbstractLineMarkersTest.java | 16 +- .../AbstractOutOfBlockModificationTest.java | 4 +- .../AbstractOverrideImplementTest.kt | 12 +- .../InsertImportOnPasteTestGenerated.java | 230 +- .../codeInsight/InspectionTestGenerated.java | 56 +- .../codeInsight/LineMarkersTestGenerated.java | 92 +- .../codeInsight/LiveTemplatesContextTest.kt | 4 +- .../idea/codeInsight/LiveTemplatesTest.java | 8 +- .../MultiFileInspectionTestGenerated.java | 10 +- .../OutOfBlockModificationTestGenerated.java | 68 +- .../generate/AbstractCodeInsightActionTest.kt | 12 +- .../CodeInsightActionTestGenerated.java | 28 +- ...eHashCodeAndEqualsActionTestGenerated.java | 42 +- ...eTestSupportMethodActionTestGenerated.java | 48 +- .../moveUpDown/CodeMoverTestGenerated.java | 384 +- .../codeInsight/smartEnter/SmartEnterTest.kt | 4 +- .../SurroundWithTestGenerated.java | 178 +- .../unwrap/UnwrapRemoveTestGenerated.java | 98 +- ...actConfigureProjectByChangingFileTest.java | 4 +- ...ureProjectByChangingFileTestGenerated.java | 72 +- ...ractJavaToKotlinCopyPasteConversionTest.kt | 8 +- ...otlinCopyPasteConversionTestGenerated.java | 76 +- .../AbstractKotlinCoverageOutputFilesTest.kt | 8 +- ...otlinCoverageOutputFilesTestGenerated.java | 6 +- .../debugger/AbstractPositionManagerTest.java | 8 +- .../debugger/AbstractSmartStepIntoTest.kt | 8 +- .../idea/debugger/KotlinDebuggerTestBase.kt | 4 +- .../idea/debugger/KotlinDebuggerTestCase.java | 10 +- .../debugger/KotlinSteppingTestGenerated.java | 176 +- .../PositionManagerTestGenerated.java | 56 +- .../debugger/SmartStepIntoTestGenerated.java | 64 +- ...AbstractEditorForEvaluateExpressionTest.kt | 16 +- .../CodeFragmentAutoImportTestGenerated.java | 6 +- ...ragmentCompletionHandlerTestGenerated.java | 16 +- .../CodeFragmentCompletionInLibraryTest.kt | 4 +- .../CodeFragmentCompletionTestGenerated.java | 36 +- ...KotlinEvaluateExpressionTestGenerated.java | 234 +- ...ectExpressionForDebuggerTestGenerated.java | 98 +- .../AbstractInternalCompiledClassesTest.kt | 4 +- .../AbstractNavigateToLibrarySourceTest.kt | 8 +- .../NavigateToLibraryRegressionTest.java | 4 +- .../NavigateToLibrarySourceTestGenerated.java | 62 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 8 +- .../ClsStubBuilderTestGenerated.java | 56 +- .../stubBuilder/ClsStubConsistencyTest.kt | 4 +- .../ClsStubForWrongAbiVersionTest.kt | 6 +- .../stubBuilder/StubConsistencyBaseTest.kt | 4 +- .../AbstractDecompiledTextBaseTest.kt | 8 +- ...mpiledTextFromJsMetadataTestGenerated.java | 34 +- .../CommonDecompiledTextTestGenerated.java | 34 +- .../DecompiledTextConsistencyTest.kt | 4 +- .../DecompiledTextForWrongAbiVersionTest.kt | 6 +- ...mpiledTextFromJsMetadataTestGenerated.java | 6 +- .../JvmDecompiledTextTestGenerated.java | 10 +- ...JavaScriptDecompiledTextConsistencyTest.kt | 4 +- .../textBuilder/TextConsistencyBaseTest.kt | 4 +- .../AbstractQuickDocProviderTest.java | 4 +- .../QuickDocProviderTestGenerated.java | 46 +- .../folding/AbstractKotlinFoldingTest.java | 4 +- .../folding/KotlinFoldingTestGenerated.java | 30 +- .../hierarchy/HierarchyTestGenerated.java | 172 +- .../AbstractDiagnosticMessageTest.java | 10 +- .../highlighter/AbstractHighlightingTest.java | 8 +- .../AbstractUsageHighlightingTest.kt | 8 +- .../DiagnosticMessageJsTestGenerated.java | 8 +- .../DiagnosticMessageTestGenerated.java | 64 +- .../HighlightExitPointsTestGenerated.java | 34 +- .../HighlightingTestGenerated.java | 62 +- .../idea/highlighter/NoErrorsInStdlibTest.kt | 8 +- .../UsageHighlightingTestGenerated.java | 6 +- .../imports/OptimizeImportsTestGenerated.java | 88 +- .../KotlinCleanupInspectionTest.kt | 8 +- .../intentions/AbstractIntentionTest.java | 4 +- .../AbstractMultiFileIntentionTest.kt | 4 +- .../intentions/IntentionTestGenerated.java | 2610 +++---- .../MultiFileIntentionTestGenerated.java | 22 +- .../declarations/JoinLinesTestGenerated.java | 86 +- .../AbstractBytecodeToolWindowTest.kt | 12 +- .../BytecodeToolWindowTestGenerated.java | 22 +- .../KotlinJavaScriptRefreshLibraryTest.kt | 4 +- .../idea/javaFacade/KotlinJavaFacadeTest.java | 4 +- .../idea/kdoc/AbstractKDocTypingTest.kt | 12 +- .../kdoc/KDocHighlightingTestGenerated.java | 6 +- .../idea/kdoc/KDocTypingTestGenerated.java | 20 +- .../idea/kdoc/KdocResolveTestGenerated.java | 26 +- .../lightClasses/LightClassEqualsTest.java | 8 +- .../navigation/AbstractGotoSuperTest.java | 4 +- .../AbstractKotlinGotoImplementationTest.kt | 4 +- .../navigation/AbstractKotlinGotoTest.java | 4 +- .../navigation/GotoSuperTestGenerated.java | 26 +- ...KotlinGotoImplementationMultifileTest.java | 4 +- ...KotlinGotoImplementationTestGenerated.java | 24 +- .../navigation/KotlinGotoTestGenerated.java | 34 +- .../ParameterInfoTestGenerated.java | 88 +- .../AbstractQuickFixMultiFileTest.java | 12 +- .../DeprecatedSymbolUsageFixSpecialTest.kt | 10 +- .../QuickFixMultiFileTestGenerated.java | 462 +- .../idea/quickfix/QuickFixTestGenerated.java | 2200 +++--- .../refactoring/AbstractMemberPullPushTest.kt | 18 +- .../JetChangeSignatureTest.java | 4 +- .../inline/AbstractInlineTest.java | 8 +- .../inline/InlineTestGenerated.java | 150 +- .../introduce/AbstractExtractionTest.kt | 4 +- .../introduce/ExtractionTestGenerated.java | 1026 +-- .../refactoring/move/MoveTestGenerated.java | 142 +- .../pullUp/PullUpTestGenerated.java | 108 +- .../pushDown/PushDownTestGenerated.java | 44 +- .../rename/RenameTestGenerated.java | 152 +- .../BuiltInsReferenceResolverTest.java | 6 +- .../resolve/AbstractPartialBodyResolveTest.kt | 16 +- ...actReferenceResolveInLibrarySourcesTest.kt | 4 +- .../resolve/AbstractReferenceResolveTest.kt | 4 +- .../PartialBodyResolveTestGenerated.java | 148 +- .../ReferenceResolveInJavaTestGenerated.java | 32 +- ...eResolveInLibrarySourcesTestGenerated.java | 12 +- .../ReferenceResolveTestGenerated.java | 202 +- .../ReferenceResolveWithLibTestGenerated.java | 26 +- ...vaWithWrongFileStructureTestGenerated.java | 8 +- .../AbstractKotlinFileStructureTest.kt | 8 +- .../KotlinFileStructureTestGenerated.java | 36 +- .../idea/stubs/AbstractResolveByStubTest.java | 2 +- .../idea/stubs/AbstractStubBuilderTest.java | 4 +- .../MultiFileHighlightingTestGenerated.java | 14 +- .../stubs/ResolveByStubTestGenerated.java | 982 +-- .../idea/stubs/StubBuilderTestGenerated.java | 76 +- .../java/AbstractJavaTypeSubstitutorTest.java | 8 +- .../JavaTypeSubstitutorTestGenerated.java | 92 +- ...StringTemplateExpressionManipulatorTest.kt | 8 +- .../psi/injection/StringInjectionHostTest.kt | 4 +- .../patternMatching/AbstractPsiUnifierTest.kt | 4 +- .../PsiUnifierTestGenerated.java | 268 +- .../safeDelete/AbstractSafeDeleteTest.java | 8 +- .../safeDelete/SafeDeleteTestGenerated.java | 426 +- .../kotlin/search/AbstractSearcherTest.java | 4 +- .../search/JUnitMembersSearcherTest.java | 4 +- .../shortenRefs/ShortenRefsTestGenerated.java | 134 +- ...tractJavaToKotlinConverterMultiFileTest.kt | 10 +- ...ractJavaToKotlinConverterSingleFileTest.kt | 12 +- .../j2k/AbstractJavaToKotlinConverterTest.kt | 6 +- ...otlinConverterForWebDemoTestGenerated.java | 1430 ++-- ...KotlinConverterMultiFileTestGenerated.java | 12 +- ...otlinConverterSingleFileTestGenerated.java | 1430 ++-- .../jps/build/AbstractIncrementalJpsTest.kt | 4 +- .../jps/build/AbstractLookupTrackerTest.kt | 4 +- ...entalCacheVersionChangedTestGenerated.java | 18 +- .../build/IncrementalJpsTestGenerated.java | 300 +- .../IncrementalLazyCachesTestGenerated.java | 18 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 4 +- .../jps/build/LookupTrackerTestGenerated.java | 19 +- .../jps/build/SimpleKotlinJpsBuildTest.kt | 4 +- .../AbstractProtoComparisonTest.kt | 6 +- .../ProtoComparisonTestGenerated.java | 54 +- .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 4 +- .../modules/KotlinModuleXmlGeneratorTest.java | 8 +- .../jetbrains/kotlin/js/test/BasicTest.java | 4 +- .../test/semantics/BridgeTestGenerated.java | 106 +- .../CompanionObjectTestGenerated.java | 6 +- .../test/semantics/DynamicTestGenerated.java | 44 +- .../FunctionExpressionTestGenerated.java | 10 +- .../InlineEvaluationOrderTestGenerated.java | 78 +- .../InlineJsStdlibTestGenerated.java | 20 +- .../test/semantics/InlineJsTestGenerated.java | 116 +- .../InlineMultiModuleTestGenerated.java | 24 +- .../InlineSizeReductionTestGenerated.java | 18 +- .../test/semantics/JsCodeTestGenerated.java | 48 +- .../js/test/semantics/LabelTestGenerated.java | 24 +- .../semantics/MultiModuleTestGenerated.java | 6 +- .../test/semantics/ReifiedTestGenerated.java | 38 +- .../semantics/ReservedWordTestGenerated.java | 348 +- .../SecondaryConstructorTestGenerated.java | 44 +- .../android/test/AbstractAndroidBoxTest.kt | 8 +- .../test/AbstractAndroidBytecodeShapeTest.kt | 4 +- .../AbstractAndroidXml2KConversionTest.kt | 6 +- .../android/test/AndroidBoxTestGenerated.java | 34 +- .../AndroidBytecodeShapeTestGenerated.java | 46 +- .../AndroidXml2KConversionTestGenerated.java | 36 +- .../AndroidCompletionTestGenerated.java | 22 +- .../AndroidFindUsagesTestGenerated.java | 24 +- .../android/AndroidGotoTestGenerated.java | 22 +- .../android/AndroidRenameTestGenerated.java | 22 +- .../kotlin/android/KotlinAndroidTestCase.java | 6 +- .../android/KotlinAndroidTestCaseBase.java | 4 +- .../ParserResultEqualityTestGenerated.java | 16 +- .../android/AndroidJpsTestCaseGenerated.java | 6 +- .../AbstractAnnotationProcessorBoxTest.kt | 8 +- .../AnnotationProcessorBoxTestGenerated.java | 30 +- 382 files changed, 21630 insertions(+), 21661 deletions(-) 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 6745cfcf87c..af933374d44 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 @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; @@ -143,10 +143,10 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { private KotlinCoreEnvironment createEnvironment(boolean isFullJdk) { return isFullJdk ? - JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( + KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( myTestRootDisposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK ) : - JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable); + KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable); } public boolean shouldWriteFilesOnDisk() { diff --git a/compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java b/compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java index ce42eb9f4d7..4824a16a637 100644 --- a/compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java +++ b/compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,40 +30,40 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/diagnostics/testsWithJava8") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetDiagnosticsWithJava8TestGenerated extends AbstractJetDiagnosticsWithFullJdkTest { +public class DiagnosticsWithJava8TestGenerated extends AbstractDiagnosticsWithFullJdkTest { public void testAllFilesPresentInTestsWithJava8() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/testsWithJava8/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractJetDiagnosticsWithFullJdkTest { + public static class Annotations extends AbstractDiagnosticsWithFullJdkTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deprecatedRepeatable.kt") public void testDeprecatedRepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/deprecatedRepeatable.kt"); doTest(fileName); } @TestMetadata("javaRepeatable.kt") public void testJavaRepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatable.kt"); doTest(fileName); } @TestMetadata("javaRepeatableRetention.kt") public void testJavaRepeatableRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaRepeatableRetention.kt"); doTest(fileName); } @TestMetadata("javaUnrepeatable.kt") public void testJavaUnrepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/annotations/javaUnrepeatable.kt"); doTest(fileName); } } @@ -71,28 +71,28 @@ public class JetDiagnosticsWithJava8TestGenerated extends AbstractJetDiagnostics @TestMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractJetDiagnosticsWithFullJdkTest { + public static class DuplicateJvmSignature extends AbstractDiagnosticsWithFullJdkTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractJetDiagnosticsWithFullJdkTest { + public static class Statics extends AbstractDiagnosticsWithFullJdkTest { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jjk.kt") public void testJjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jjk.kt"); doTest(fileName); } @TestMetadata("jk.kt") public void testJk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/duplicateJvmSignature/statics/jk.kt"); doTest(fileName); } } @@ -101,14 +101,14 @@ public class JetDiagnosticsWithJava8TestGenerated extends AbstractJetDiagnostics @TestMetadata("compiler/testData/diagnostics/testsWithJava8/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractJetDiagnosticsWithFullJdkTest { + public static class Statics extends AbstractDiagnosticsWithFullJdkTest { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/statics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava8/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inheritanceStaticMethodFromInterface.kt") public void testInheritanceStaticMethodFromInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJava8/statics/inheritanceStaticMethodFromInterface.kt"); doTest(fileName); } } diff --git a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java index 6d1f5798e5b..340be4d01cc 100644 --- a/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java +++ b/compiler/java8-tests/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJava8CodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/boxWithJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/boxWithJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("defaultMethodCallFromTrait") public void testDefaultMethodCallFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallFromTrait/"); doTestWithJava(fileName); } @TestMetadata("defaultMethodCallViaClass") public void testDefaultMethodCallViaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaClass/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaClass/"); doTestWithJava(fileName); } @TestMetadata("defaultMethodCallViaTrait") public void testDefaultMethodCallViaTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodCallViaTrait/"); doTestWithJava(fileName); } @TestMetadata("defaultMethodOverride") public void testDefaultMethodOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/defaultMethodOverride/"); doTestWithJava(fileName); } @TestMetadata("dontDelegateToDefaultMethods") public void testDontDelegateToDefaultMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/dontDelegateToDefaultMethods/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/dontDelegateToDefaultMethods/"); doTestWithJava(fileName); } @TestMetadata("inheritKotlin") public void testInheritKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/inheritKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/inheritKotlin/"); doTestWithJava(fileName); } @TestMetadata("invokeDefaultViaSuper") public void testInvokeDefaultViaSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/invokeDefaultViaSuper/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/invokeDefaultViaSuper/"); doTestWithJava(fileName); } @TestMetadata("longChainOfKotlinExtendsFromJavaWithDefault") public void testLongChainOfKotlinExtendsFromJavaWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/longChainOfKotlinExtendsFromJavaWithDefault/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/longChainOfKotlinExtendsFromJavaWithDefault/"); doTestWithJava(fileName); } @TestMetadata("samOnInterfaceWithDefaultMethod") public void testSamOnInterfaceWithDefaultMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/samOnInterfaceWithDefaultMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/samOnInterfaceWithDefaultMethod/"); doTestWithJava(fileName); } @@ -94,18 +94,18 @@ public class BlackBoxWithJava8CodegenTestGenerated extends AbstractBlackBoxCodeg @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/boxWithJava/reflection"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/boxWithJava/reflection"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("realParameterNames") public void testRealParameterNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/reflection/realParameterNames/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/reflection/realParameterNames/"); doTestWithJava(fileName); } @TestMetadata("synthesizedParameterNames") public void testSynthesizedParameterNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/reflection/synthesizedParameterNames/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/boxWithJava/reflection/synthesizedParameterNames/"); doTestWithJava(fileName); } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java index 506150a7abf..37acc5a63c4 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractCompilerLightClassTest.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithWithJava; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; @@ -38,10 +38,10 @@ public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTest @Override @NotNull protected CompilerConfiguration createCompilerConfiguration(File javaFilesDir) { - return JetTestUtils.compilerConfigurationForTests( + return KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, - Arrays.asList(JetTestUtils.getAnnotationsJar()), + Arrays.asList(KotlinTestUtils.getAnnotationsJar()), Arrays.asList(javaFilesDir) ); } @@ -55,7 +55,7 @@ public abstract class AbstractCompilerLightClassTest extends KotlinMultiFileTest @NotNull public static JavaElementFinder createFinder(@NotNull KotlinCoreEnvironment environment) throws IOException { // We need to resolve all the files in order too fill in the trace that sits inside LightClassGenerationSupport - JetTestUtils.resolveAllKotlinFiles(environment); + KotlinTestUtils.resolveAllKotlinFiles(environment); return JavaElementFinder.getInstance(environment.getProject()); } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index ce22ebb45f2..267111eff3b 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationClass.kt") public void testAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt"); doTest(fileName); } @@ -46,24 +46,24 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Delegation extends AbstractCompilerLightClassTest { public void testAllFilesPresentInDelegation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Function.kt"); doTest(fileName); } @TestMetadata("Property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt"); doTest(fileName); } @TestMetadata("WithPlatformTypes.kt") public void testWithPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/WithPlatformTypes.kt"); doTest(fileName); } } @@ -73,24 +73,24 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Facades extends AbstractCompilerLightClassTest { public void testAllFilesPresentInFacades() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EmptyFile.kt") public void testEmptyFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt"); doTest(fileName); } @TestMetadata("SingleFile.kt") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt"); doTest(fileName); } @TestMetadata("SingleJvmClassName.kt") public void testSingleJvmClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"); doTest(fileName); } } @@ -100,126 +100,126 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractCompilerLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt"); doTest(fileName); } @TestMetadata("ClassObjectField.kt") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt"); doTest(fileName); } @TestMetadata("ClassWithConstructor.kt") public void testClassWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt"); doTest(fileName); } @TestMetadata("ClassWithConstructorAndProperties.kt") public void testClassWithConstructorAndProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt"); doTest(fileName); } @TestMetadata("FileFacade.kt") public void testFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt"); doTest(fileName); } @TestMetadata("Generic.kt") public void testGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt"); doTest(fileName); } @TestMetadata("IntOverridesAny.kt") public void testIntOverridesAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt"); doTest(fileName); } @TestMetadata("JvmOverloads.kt") public void testJvmOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt"); doTest(fileName); } @TestMetadata("NullableUnitReturn.kt") public void testNullableUnitReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt"); doTest(fileName); } @TestMetadata("OverrideAnyWithUnit.kt") public void testOverrideAnyWithUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt"); doTest(fileName); } @TestMetadata("PlatformTypes.kt") public void testPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt"); doTest(fileName); } @TestMetadata("Primitives.kt") public void testPrimitives() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt"); doTest(fileName); } @TestMetadata("PrivateInClass.kt") public void testPrivateInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt"); doTest(fileName); } @TestMetadata("PrivateInTrait.kt") public void testPrivateInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt"); doTest(fileName); } @TestMetadata("Synthetic.kt") public void testSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt"); doTest(fileName); } @TestMetadata("TraitClassObjectField.kt") public void testTraitClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt"); doTest(fileName); } @TestMetadata("UnitAsGenericArgument.kt") public void testUnitAsGenericArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt"); doTest(fileName); } @TestMetadata("UnitParameter.kt") public void testUnitParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt"); doTest(fileName); } @TestMetadata("VoidReturn.kt") public void testVoidReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"); doTest(fileName); } } @@ -229,12 +229,12 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractCompilerLightClassTest { public void testAllFilesPresentInObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("SimpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"); doTest(fileName); } } @@ -244,18 +244,18 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT @RunWith(JUnit3RunnerWithInners.class) public static class PublicField extends AbstractCompilerLightClassTest { public void testAllFilesPresentInPublicField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CompanionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 3b6542322b2..b4f7895c9b3 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.Collections; @@ -39,7 +39,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { @Override protected void extraConfiguration(@NotNull CompilerConfiguration configuration) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KotlinTestUtils.getAnnotationsJar()); } public void testExtraAnnotations() throws Exception { @@ -64,6 +64,6 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { sb.append(annotation.getText()).append("\n"); } - JetTestUtils.assertEqualsToFile(new File(testDir, getTestName(false) + ".annotations.txt"), sb.toString()); + KotlinTestUtils.assertEqualsToFile(new File(testDir, getTestName(false) + ".annotations.txt"), sb.toString()); } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt index 8e5c8eebb50..5b20ef5d17a 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiClass import com.intellij.psi.impl.compiled.ClsElementImpl import junit.framework.TestCase -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.regex.Pattern @@ -41,7 +41,7 @@ object LightClassTestCommon { val lightClass = findLightClass(fqName) val actual = actualText(fqName, lightClass, normalizeText) - JetTestUtils.assertEqualsToFile(JetTestUtils.replaceExtension(testDataFile, "java"), actual) + KotlinTestUtils.assertEqualsToFile(KotlinTestUtils.replaceExtension(testDataFile, "java"), actual) } private fun actualText(fqName: String?, lightClass: PsiClass?, normalizeText: (String) -> String): String { diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index 3596bbc8e14..68462045b3e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -33,7 +33,7 @@ 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 org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.IOException; @@ -51,10 +51,10 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { protected void doTest(String fileName) throws Exception { File file = new File(fileName); - KtFile jetFile = JetTestUtils.loadJetFile(getProject(), file); + KtFile jetFile = KotlinTestUtils.loadJetFile(getProject(), file); Map data = new LinkedHashMap(); - AnalysisResult analysisResult = JetTestUtils.analyzeFile(jetFile, getEnvironment()); + AnalysisResult analysisResult = KotlinTestUtils.analyzeFile(jetFile, getEnvironment()); List declarations = jetFile.getDeclarations(); BindingContext bindingContext = analysisResult.getBindingContext(); for (KtDeclaration declaration : declarations) { @@ -126,8 +126,8 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { checkPseudocode((PseudocodeImpl) pseudocode); } - File expectedInstructionsFile = JetTestUtils.replaceExtension(file, getDataFileExtension()); - JetTestUtils.assertEqualsToFile(expectedInstructionsFile, instructionDump.toString()); + File expectedInstructionsFile = KotlinTestUtils.replaceExtension(file, getDataFileExtension()); + KotlinTestUtils.assertEqualsToFile(expectedInstructionsFile, instructionDump.toString()); } protected String getDataFileExtension() { diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java index ab6412dd6d9..f39a875c592 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java @@ -32,7 +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.KtElement; import org.jetbrains.kotlin.psi.KtNamedDeclaration; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.FileNotFoundException; @@ -41,7 +41,7 @@ import java.util.*; public class CFGraphToDotFilePrinter { public static void dumpDot(File file, Collection pseudocodes) throws FileNotFoundException { - File target = JetTestUtils.replaceExtension(file, "dot"); + File target = KotlinTestUtils.replaceExtension(file, "dot"); PrintStream out = new PrintStream(target); diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java index a05e3e8a01d..88696c07208 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ControlFlowTestGenerated extends AbstractControlFlowTest { public void testAllFilesPresentInCfg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg/arrays") @@ -40,66 +40,66 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Arrays extends AbstractControlFlowTest { public void testAllFilesPresentInArrays() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt"); doTest(fileName); } @TestMetadata("arrayAccessExpression.kt") public void testArrayAccessExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt"); doTest(fileName); } @TestMetadata("arrayInc.kt") public void testArrayInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt"); doTest(fileName); } @TestMetadata("arrayIncUnresolved.kt") public void testArrayIncUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt"); doTest(fileName); } @TestMetadata("ArrayOfFunctions.kt") public void testArrayOfFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt"); doTest(fileName); } @TestMetadata("arraySet.kt") public void testArraySet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt"); doTest(fileName); } @TestMetadata("arraySetNoRHS.kt") public void testArraySetNoRHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt"); doTest(fileName); } @TestMetadata("arraySetPlusAssign.kt") public void testArraySetPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt"); doTest(fileName); } @TestMetadata("arraySetPlusAssignUnresolved.kt") public void testArraySetPlusAssignUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt"); doTest(fileName); } @TestMetadata("arraySetUnresolved.kt") public void testArraySetUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt"); doTest(fileName); } } @@ -109,24 +109,24 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Basic extends AbstractControlFlowTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt"); doTest(fileName); } @TestMetadata("EmptyFunction.kt") public void testEmptyFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt"); doTest(fileName); } @TestMetadata("ShortFunction.kt") public void testShortFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt"); doTest(fileName); } } @@ -136,18 +136,18 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Bugs extends AbstractControlFlowTest { public void testAllFilesPresentInBugs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jumpToOuterScope.kt") public void testJumpToOuterScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt"); doTest(fileName); } @TestMetadata("kt7761.kt") public void testKt7761() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/kt7761.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/bugs/kt7761.kt"); doTest(fileName); } } @@ -157,78 +157,78 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractControlFlowTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("continueInDoWhile.kt") public void testContinueInDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt"); doTest(fileName); } @TestMetadata("continueInFor.kt") public void testContinueInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt"); doTest(fileName); } @TestMetadata("continueInWhile.kt") public void testContinueInWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt"); doTest(fileName); } @TestMetadata("Finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt"); doTest(fileName); } @TestMetadata("FinallyTestCopy.kt") public void testFinallyTestCopy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt"); doTest(fileName); } @TestMetadata("For.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt"); doTest(fileName); } @TestMetadata("If.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt"); doTest(fileName); } @TestMetadata("localAndNonlocalReturnsWithFinally.kt") public void testLocalAndNonlocalReturnsWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/localAndNonlocalReturnsWithFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/localAndNonlocalReturnsWithFinally.kt"); doTest(fileName); } @TestMetadata("OnlyWhileInFunctionBody.kt") public void testOnlyWhileInFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt"); doTest(fileName); } @TestMetadata("returnsInWhen.kt") public void testReturnsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt"); doTest(fileName); } @TestMetadata("whenConditions.kt") public void testWhenConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt"); doTest(fileName); } @TestMetadata("whenExhaustive.kt") public void testWhenExhaustive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenExhaustive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenExhaustive.kt"); doTest(fileName); } } @@ -238,60 +238,60 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Conventions extends AbstractControlFlowTest { public void testAllFilesPresentInConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bothReceivers.kt") public void testBothReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt"); doTest(fileName); } @TestMetadata("complexAssignmentWithGetSetViaVar.kt") public void testComplexAssignmentWithGetSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); doTest(fileName); } @TestMetadata("complexAssignmentWithSetViaVar.kt") public void testComplexAssignmentWithSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); doTest(fileName); } @TestMetadata("getViaVar.kt") public void testGetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); doTest(fileName); } @TestMetadata("incrementAtTheEnd.kt") public void testIncrementAtTheEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt"); doTest(fileName); } @TestMetadata("notEqual.kt") public void testNotEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); doTest(fileName); } @TestMetadata("setViaVar.kt") public void testSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); doTest(fileName); } } @@ -301,24 +301,24 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeadCode extends AbstractControlFlowTest { public void testAllFilesPresentInDeadCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DeadCode.kt") public void testDeadCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt"); doTest(fileName); } @TestMetadata("returnInElvis.kt") public void testReturnInElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt"); doTest(fileName); } } @@ -328,7 +328,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractControlFlowTest { public void testAllFilesPresentInDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects") @@ -336,24 +336,24 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassesAndObjects extends AbstractControlFlowTest { public void testAllFilesPresentInClassesAndObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousInitializers.kt") public void testAnonymousInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt"); doTest(fileName); } @TestMetadata("delegationByExpression.kt") public void testDelegationByExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt"); doTest(fileName); } @TestMetadata("delegationBySuperCall.kt") public void testDelegationBySuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt"); doTest(fileName); } } @@ -363,12 +363,12 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractControlFlowTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("unusedFunctionLiteral.kt") public void testUnusedFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt"); doTest(fileName); } } @@ -378,36 +378,36 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractControlFlowTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousFunctionInBlock.kt") public void testAnonymousFunctionInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/anonymousFunctionInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/anonymousFunctionInBlock.kt"); doTest(fileName); } @TestMetadata("FailFunction.kt") public void testFailFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt"); doTest(fileName); } @TestMetadata("functionAsExpression.kt") public void testFunctionAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/functionAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/functionAsExpression.kt"); doTest(fileName); } @TestMetadata("namedFunctionInBlock.kt") public void testNamedFunctionInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/namedFunctionInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/namedFunctionInBlock.kt"); doTest(fileName); } @TestMetadata("typeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt"); doTest(fileName); } } @@ -417,36 +417,36 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Local extends AbstractControlFlowTest { public void testAllFilesPresentInLocal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt"); doTest(fileName); } @TestMetadata("LocalDeclarations.kt") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localFunction.kt"); doTest(fileName); } @TestMetadata("localProperty.kt") public void testLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt"); doTest(fileName); } @TestMetadata("ObjectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt"); doTest(fileName); } } @@ -456,18 +456,18 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiDeclaration extends AbstractControlFlowTest { public void testAllFilesPresentInMultiDeclaration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDecl.kt") public void testMultiDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt"); doTest(fileName); } @TestMetadata("multiDeclarationWithError.kt") public void testMultiDeclarationWithError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt"); doTest(fileName); } } @@ -477,18 +477,18 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractControlFlowTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("unreachableDelegation.kt") public void testUnreachableDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt"); doTest(fileName); } } @@ -499,144 +499,144 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractControlFlowTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignmentToThis.kt") public void testAssignmentToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt"); doTest(fileName); } @TestMetadata("Assignments.kt") public void testAssignments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt"); doTest(fileName); } @TestMetadata("callableReferences.kt") public void testCallableReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt"); doTest(fileName); } @TestMetadata("casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt"); doTest(fileName); } @TestMetadata("chainedQualifiedExpression.kt") public void testChainedQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("expressionAsFunction.kt") public void testExpressionAsFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt"); doTest(fileName); } @TestMetadata("incdec.kt") public void testIncdec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt"); doTest(fileName); } @TestMetadata("invalidVariableCall.kt") public void testInvalidVariableCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt"); doTest(fileName); } @TestMetadata("labeledExpression.kt") public void testLabeledExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/labeledExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/labeledExpression.kt"); doTest(fileName); } @TestMetadata("LazyBooleans.kt") public void testLazyBooleans() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt"); doTest(fileName); } @TestMetadata("nothingExpr.kt") public void testNothingExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt"); doTest(fileName); } @TestMetadata("parenthesizedSelector.kt") public void testParenthesizedSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt"); doTest(fileName); } @TestMetadata("propertySafeCall.kt") public void testPropertySafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressionWithoutSelector.kt") public void testQualifiedExpressionWithoutSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt"); doTest(fileName); } @TestMetadata("ReturnFromExpression.kt") public void testReturnFromExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt"); doTest(fileName); } @TestMetadata("thisExpression.kt") public void testThisExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt"); doTest(fileName); } @TestMetadata("unresolvedCall.kt") public void testUnresolvedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt"); doTest(fileName); } @TestMetadata("unresolvedCalls.kt") public void testUnresolvedCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCalls.kt"); doTest(fileName); } @TestMetadata("unresolvedCallsWithReceiver.kt") public void testUnresolvedCallsWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCallsWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCallsWithReceiver.kt"); doTest(fileName); } @TestMetadata("unresolvedProperty.kt") public void testUnresolvedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt"); doTest(fileName); } @TestMetadata("unresolvedWriteLHS.kt") public void testUnresolvedWriteLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt"); doTest(fileName); } @TestMetadata("unsupportedReturns.kt") public void testUnsupportedReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt"); doTest(fileName); } @TestMetadata("unusedExpressionSimpleName.kt") public void testUnusedExpressionSimpleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt"); doTest(fileName); } } @@ -646,18 +646,18 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractControlFlowTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DefaultValuesForArguments.kt") public void testDefaultValuesForArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt"); doTest(fileName); } @TestMetadata("unmappedArgs.kt") public void testUnmappedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt"); doTest(fileName); } } @@ -667,36 +667,36 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractControlFlowTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("withPrimary.kt") public void testWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimary.kt"); doTest(fileName); } @TestMetadata("withPrimarySuper.kt") public void testWithPrimarySuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimarySuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimarySuper.kt"); doTest(fileName); } @TestMetadata("withReturn.kt") public void testWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withReturn.kt"); doTest(fileName); } @TestMetadata("withoutPrimary.kt") public void testWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimary.kt"); doTest(fileName); } @TestMetadata("withoutPrimarySuper.kt") public void testWithoutPrimarySuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimarySuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimarySuper.kt"); doTest(fileName); } } @@ -706,36 +706,36 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class TailCalls extends AbstractControlFlowTest { public void testAllFilesPresentInTailCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt"); doTest(fileName); } @TestMetadata("finallyWithReturn.kt") public void testFinallyWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt"); doTest(fileName); } @TestMetadata("sum.kt") public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt"); doTest(fileName); } @TestMetadata("try.kt") public void testTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt"); doTest(fileName); } @TestMetadata("tryCatchFinally.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java index 5d7f1b73afa..ef5177d19df 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DataFlowTestGenerated extends AbstractDataFlowTest { public void testAllFilesPresentInCfg_variables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg-variables/basic") @@ -40,36 +40,36 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Basic extends AbstractDataFlowTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("IfWithUninitialized.kt") public void testIfWithUninitialized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt"); doTest(fileName); } @TestMetadata("InitializedNotDeclared.kt") public void testInitializedNotDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt"); doTest(fileName); } @TestMetadata("UsageInFunctionLiteral.kt") public void testUsageInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("VariablesInitialization.kt") public void testVariablesInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt"); doTest(fileName); } @TestMetadata("VariablesUsage.kt") public void testVariablesUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt"); doTest(fileName); } } @@ -79,24 +79,24 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class Bugs extends AbstractDataFlowTest { public void testAllFilesPresentInBugs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("referenceToPropertyInitializer.kt") public void testReferenceToPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("varInitializationInIf.kt") public void testVarInitializationInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt"); doTest(fileName); } @TestMetadata("varInitializationInIfInCycle.kt") public void testVarInitializationInIfInCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt"); doTest(fileName); } } @@ -106,78 +106,78 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @RunWith(JUnit3RunnerWithInners.class) public static class LexicalScopes extends AbstractDataFlowTest { public void testAllFilesPresentInLexicalScopes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("doWhileScope.kt") public void testDoWhileScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt"); doTest(fileName); } @TestMetadata("forScope.kt") public void testForScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt"); doTest(fileName); } @TestMetadata("functionLiteralScope.kt") public void testFunctionLiteralScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt"); doTest(fileName); } @TestMetadata("ifScope.kt") public void testIfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt"); doTest(fileName); } @TestMetadata("localFunctionScope.kt") public void testLocalFunctionScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt"); doTest(fileName); } @TestMetadata("localFunctionScopeWithoutBody.kt") public void testLocalFunctionScopeWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt"); doTest(fileName); } @TestMetadata("localObject.kt") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt"); doTest(fileName); } @TestMetadata("objectLiteralScope.kt") public void testObjectLiteralScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt"); doTest(fileName); } @TestMetadata("propertyAccessorScope.kt") public void testPropertyAccessorScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt"); doTest(fileName); } @TestMetadata("tryScope.kt") public void testTryScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt"); doTest(fileName); } @TestMetadata("whileScope.kt") public void testWhileScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java index aad75af23f9..04aab0aca88 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +34,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Cfg extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg/arrays") @@ -42,66 +42,66 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Arrays extends AbstractPseudoValueTest { public void testAllFilesPresentInArrays() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt"); doTest(fileName); } @TestMetadata("arrayAccessExpression.kt") public void testArrayAccessExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt"); doTest(fileName); } @TestMetadata("arrayInc.kt") public void testArrayInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt"); doTest(fileName); } @TestMetadata("arrayIncUnresolved.kt") public void testArrayIncUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayIncUnresolved.kt"); doTest(fileName); } @TestMetadata("ArrayOfFunctions.kt") public void testArrayOfFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt"); doTest(fileName); } @TestMetadata("arraySet.kt") public void testArraySet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt"); doTest(fileName); } @TestMetadata("arraySetNoRHS.kt") public void testArraySetNoRHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetNoRHS.kt"); doTest(fileName); } @TestMetadata("arraySetPlusAssign.kt") public void testArraySetPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt"); doTest(fileName); } @TestMetadata("arraySetPlusAssignUnresolved.kt") public void testArraySetPlusAssignUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssignUnresolved.kt"); doTest(fileName); } @TestMetadata("arraySetUnresolved.kt") public void testArraySetUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetUnresolved.kt"); doTest(fileName); } } @@ -111,24 +111,24 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Basic extends AbstractPseudoValueTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt"); doTest(fileName); } @TestMetadata("EmptyFunction.kt") public void testEmptyFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt"); doTest(fileName); } @TestMetadata("ShortFunction.kt") public void testShortFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt"); doTest(fileName); } } @@ -138,18 +138,18 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Bugs extends AbstractPseudoValueTest { public void testAllFilesPresentInBugs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jumpToOuterScope.kt") public void testJumpToOuterScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt"); doTest(fileName); } @TestMetadata("kt7761.kt") public void testKt7761() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/kt7761.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/bugs/kt7761.kt"); doTest(fileName); } } @@ -159,78 +159,78 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractPseudoValueTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("continueInDoWhile.kt") public void testContinueInDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt"); doTest(fileName); } @TestMetadata("continueInFor.kt") public void testContinueInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt"); doTest(fileName); } @TestMetadata("continueInWhile.kt") public void testContinueInWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt"); doTest(fileName); } @TestMetadata("Finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt"); doTest(fileName); } @TestMetadata("FinallyTestCopy.kt") public void testFinallyTestCopy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt"); doTest(fileName); } @TestMetadata("For.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt"); doTest(fileName); } @TestMetadata("If.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt"); doTest(fileName); } @TestMetadata("localAndNonlocalReturnsWithFinally.kt") public void testLocalAndNonlocalReturnsWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/localAndNonlocalReturnsWithFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/localAndNonlocalReturnsWithFinally.kt"); doTest(fileName); } @TestMetadata("OnlyWhileInFunctionBody.kt") public void testOnlyWhileInFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt"); doTest(fileName); } @TestMetadata("returnsInWhen.kt") public void testReturnsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt"); doTest(fileName); } @TestMetadata("whenConditions.kt") public void testWhenConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt"); doTest(fileName); } @TestMetadata("whenExhaustive.kt") public void testWhenExhaustive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenExhaustive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenExhaustive.kt"); doTest(fileName); } } @@ -240,60 +240,60 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Conventions extends AbstractPseudoValueTest { public void testAllFilesPresentInConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bothReceivers.kt") public void testBothReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt"); doTest(fileName); } @TestMetadata("complexAssignmentWithGetSetViaVar.kt") public void testComplexAssignmentWithGetSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); doTest(fileName); } @TestMetadata("complexAssignmentWithSetViaVar.kt") public void testComplexAssignmentWithSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); doTest(fileName); } @TestMetadata("getViaVar.kt") public void testGetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); doTest(fileName); } @TestMetadata("incrementAtTheEnd.kt") public void testIncrementAtTheEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt"); doTest(fileName); } @TestMetadata("notEqual.kt") public void testNotEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); doTest(fileName); } @TestMetadata("setViaVar.kt") public void testSetViaVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); doTest(fileName); } } @@ -303,24 +303,24 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeadCode extends AbstractPseudoValueTest { public void testAllFilesPresentInDeadCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DeadCode.kt") public void testDeadCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt"); doTest(fileName); } @TestMetadata("returnInElvis.kt") public void testReturnInElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt"); doTest(fileName); } } @@ -330,7 +330,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractPseudoValueTest { public void testAllFilesPresentInDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects") @@ -338,24 +338,24 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassesAndObjects extends AbstractPseudoValueTest { public void testAllFilesPresentInClassesAndObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousInitializers.kt") public void testAnonymousInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt"); doTest(fileName); } @TestMetadata("delegationByExpression.kt") public void testDelegationByExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt"); doTest(fileName); } @TestMetadata("delegationBySuperCall.kt") public void testDelegationBySuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt"); doTest(fileName); } } @@ -365,12 +365,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("unusedFunctionLiteral.kt") public void testUnusedFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt"); doTest(fileName); } } @@ -380,36 +380,36 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousFunctionInBlock.kt") public void testAnonymousFunctionInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/anonymousFunctionInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/anonymousFunctionInBlock.kt"); doTest(fileName); } @TestMetadata("FailFunction.kt") public void testFailFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt"); doTest(fileName); } @TestMetadata("functionAsExpression.kt") public void testFunctionAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/functionAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/functionAsExpression.kt"); doTest(fileName); } @TestMetadata("namedFunctionInBlock.kt") public void testNamedFunctionInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/namedFunctionInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/namedFunctionInBlock.kt"); doTest(fileName); } @TestMetadata("typeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt"); doTest(fileName); } } @@ -419,36 +419,36 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Local extends AbstractPseudoValueTest { public void testAllFilesPresentInLocal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt"); doTest(fileName); } @TestMetadata("LocalDeclarations.kt") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localFunction.kt"); doTest(fileName); } @TestMetadata("localProperty.kt") public void testLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt"); doTest(fileName); } @TestMetadata("ObjectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt"); doTest(fileName); } } @@ -458,18 +458,18 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiDeclaration extends AbstractPseudoValueTest { public void testAllFilesPresentInMultiDeclaration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDecl.kt") public void testMultiDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt"); doTest(fileName); } @TestMetadata("multiDeclarationWithError.kt") public void testMultiDeclarationWithError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt"); doTest(fileName); } } @@ -479,18 +479,18 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractPseudoValueTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("unreachableDelegation.kt") public void testUnreachableDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt"); doTest(fileName); } } @@ -501,144 +501,144 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractPseudoValueTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignmentToThis.kt") public void testAssignmentToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt"); doTest(fileName); } @TestMetadata("Assignments.kt") public void testAssignments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt"); doTest(fileName); } @TestMetadata("callableReferences.kt") public void testCallableReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt"); doTest(fileName); } @TestMetadata("casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt"); doTest(fileName); } @TestMetadata("chainedQualifiedExpression.kt") public void testChainedQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("expressionAsFunction.kt") public void testExpressionAsFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt"); doTest(fileName); } @TestMetadata("incdec.kt") public void testIncdec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt"); doTest(fileName); } @TestMetadata("invalidVariableCall.kt") public void testInvalidVariableCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt"); doTest(fileName); } @TestMetadata("labeledExpression.kt") public void testLabeledExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/labeledExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/labeledExpression.kt"); doTest(fileName); } @TestMetadata("LazyBooleans.kt") public void testLazyBooleans() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt"); doTest(fileName); } @TestMetadata("nothingExpr.kt") public void testNothingExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt"); doTest(fileName); } @TestMetadata("parenthesizedSelector.kt") public void testParenthesizedSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt"); doTest(fileName); } @TestMetadata("propertySafeCall.kt") public void testPropertySafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressionWithoutSelector.kt") public void testQualifiedExpressionWithoutSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt"); doTest(fileName); } @TestMetadata("ReturnFromExpression.kt") public void testReturnFromExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt"); doTest(fileName); } @TestMetadata("thisExpression.kt") public void testThisExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt"); doTest(fileName); } @TestMetadata("unresolvedCall.kt") public void testUnresolvedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt"); doTest(fileName); } @TestMetadata("unresolvedCalls.kt") public void testUnresolvedCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCalls.kt"); doTest(fileName); } @TestMetadata("unresolvedCallsWithReceiver.kt") public void testUnresolvedCallsWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCallsWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCallsWithReceiver.kt"); doTest(fileName); } @TestMetadata("unresolvedProperty.kt") public void testUnresolvedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt"); doTest(fileName); } @TestMetadata("unresolvedWriteLHS.kt") public void testUnresolvedWriteLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt"); doTest(fileName); } @TestMetadata("unsupportedReturns.kt") public void testUnsupportedReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt"); doTest(fileName); } @TestMetadata("unusedExpressionSimpleName.kt") public void testUnusedExpressionSimpleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt"); doTest(fileName); } } @@ -648,18 +648,18 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DefaultValuesForArguments.kt") public void testDefaultValuesForArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt"); doTest(fileName); } @TestMetadata("unmappedArgs.kt") public void testUnmappedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt"); doTest(fileName); } } @@ -669,36 +669,36 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractPseudoValueTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("withPrimary.kt") public void testWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimary.kt"); doTest(fileName); } @TestMetadata("withPrimarySuper.kt") public void testWithPrimarySuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimarySuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withPrimarySuper.kt"); doTest(fileName); } @TestMetadata("withReturn.kt") public void testWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withReturn.kt"); doTest(fileName); } @TestMetadata("withoutPrimary.kt") public void testWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimary.kt"); doTest(fileName); } @TestMetadata("withoutPrimarySuper.kt") public void testWithoutPrimarySuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimarySuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/secondaryConstructors/withoutPrimarySuper.kt"); doTest(fileName); } } @@ -708,36 +708,36 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class TailCalls extends AbstractPseudoValueTest { public void testAllFilesPresentInTailCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt"); doTest(fileName); } @TestMetadata("finallyWithReturn.kt") public void testFinallyWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt"); doTest(fileName); } @TestMetadata("sum.kt") public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt"); doTest(fileName); } @TestMetadata("try.kt") public void testTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt"); doTest(fileName); } @TestMetadata("tryCatchFinally.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt"); doTest(fileName); } } @@ -748,7 +748,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Cfg_variables extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg_variables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/cfg-variables/basic") @@ -756,36 +756,36 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Basic extends AbstractPseudoValueTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("IfWithUninitialized.kt") public void testIfWithUninitialized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt"); doTest(fileName); } @TestMetadata("InitializedNotDeclared.kt") public void testInitializedNotDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt"); doTest(fileName); } @TestMetadata("UsageInFunctionLiteral.kt") public void testUsageInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("VariablesInitialization.kt") public void testVariablesInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt"); doTest(fileName); } @TestMetadata("VariablesUsage.kt") public void testVariablesUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt"); doTest(fileName); } } @@ -795,24 +795,24 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class Bugs extends AbstractPseudoValueTest { public void testAllFilesPresentInBugs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("referenceToPropertyInitializer.kt") public void testReferenceToPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("varInitializationInIf.kt") public void testVarInitializationInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt"); doTest(fileName); } @TestMetadata("varInitializationInIfInCycle.kt") public void testVarInitializationInIfInCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt"); doTest(fileName); } } @@ -822,78 +822,78 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @RunWith(JUnit3RunnerWithInners.class) public static class LexicalScopes extends AbstractPseudoValueTest { public void testAllFilesPresentInLexicalScopes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("doWhileScope.kt") public void testDoWhileScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt"); doTest(fileName); } @TestMetadata("forScope.kt") public void testForScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt"); doTest(fileName); } @TestMetadata("functionLiteralScope.kt") public void testFunctionLiteralScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt"); doTest(fileName); } @TestMetadata("ifScope.kt") public void testIfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt"); doTest(fileName); } @TestMetadata("localFunctionScope.kt") public void testLocalFunctionScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt"); doTest(fileName); } @TestMetadata("localFunctionScopeWithoutBody.kt") public void testLocalFunctionScopeWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt"); doTest(fileName); } @TestMetadata("localObject.kt") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt"); doTest(fileName); } @TestMetadata("objectLiteralScope.kt") public void testObjectLiteralScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt"); doTest(fileName); } @TestMetadata("propertyAccessorScope.kt") public void testPropertyAccessorScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt"); doTest(fileName); } @TestMetadata("tryScope.kt") public void testTryScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt"); doTest(fileName); } @TestMetadata("whileScope.kt") public void testWhileScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java index 0849e5893c9..3a7f8473ad1 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java @@ -28,13 +28,13 @@ import org.jetbrains.kotlin.psi.KtFile; 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 org.jetbrains.kotlin.test.KotlinLiteFixture; import java.io.File; import java.util.Collections; import java.util.List; -public class CheckerTestUtilTest extends JetLiteFixture { +public class CheckerTestUtilTest extends KotlinLiteFixture { public CheckerTestUtilTest() { super("diagnostics/checkerTestUtil"); @@ -129,7 +129,7 @@ public class CheckerTestUtilTest extends JetLiteFixture { } public void testAbstractJetDiagnosticsTest() throws Exception { - AbstractJetDiagnosticsTest test = new AbstractJetDiagnosticsTest() { + AbstractDiagnosticsTest test = new AbstractDiagnosticsTest() { {setUp();} }; test.doTest(myFullDataPath + File.separatorChar + "test_with_diagnostic.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java index 164801f91ea..a7173da77a2 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,1096 +28,1096 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { +public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Tests extends AbstractJetDiagnosticsTest { + public static class Tests extends AbstractDiagnosticsTest { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Abstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Abstract.kt"); doTest(fileName); } @TestMetadata("AbstractAccessor.kt") public void testAbstractAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractAccessor.kt"); doTest(fileName); } @TestMetadata("AbstractInAbstractClass.kt") public void testAbstractInAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt"); doTest(fileName); } @TestMetadata("AbstractInClass.kt") public void testAbstractInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInClass.kt"); doTest(fileName); } @TestMetadata("AbstractInTrait.kt") public void testAbstractInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInTrait.kt"); doTest(fileName); } public void testAllFilesPresentInTests() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousInitializerVarAndConstructor.kt") public void testAnonymousInitializerVarAndConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.kt"); doTest(fileName); } @TestMetadata("AnonymousInitializers.kt") public void testAnonymousInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializers.kt"); doTest(fileName); } @TestMetadata("AssignToArrayElement.kt") public void testAssignToArrayElement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AssignToArrayElement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AssignToArrayElement.kt"); doTest(fileName); } @TestMetadata("AutoCreatedIt.kt") public void testAutoCreatedIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AutoCreatedIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AutoCreatedIt.kt"); doTest(fileName); } @TestMetadata("BacktickNames.kt") public void testBacktickNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BacktickNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BacktickNames.kt"); doTest(fileName); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Basic.kt"); doTest(fileName); } @TestMetadata("BinaryCallsOnNullableValues.kt") public void testBinaryCallsOnNullableValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt"); doTest(fileName); } @TestMetadata("Bounds.kt") public void testBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Bounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Bounds.kt"); doTest(fileName); } @TestMetadata("BreakContinue.kt") public void testBreakContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BreakContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BreakContinue.kt"); doTest(fileName); } @TestMetadata("BreakContinueInWhen.kt") public void testBreakContinueInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BreakContinueInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BreakContinueInWhen.kt"); doTest(fileName); } @TestMetadata("Builders.kt") public void testBuilders() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Builders.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Builders.kt"); doTest(fileName); } @TestMetadata("Casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Casts.kt"); doTest(fileName); } @TestMetadata("CharacterLiterals.kt") public void testCharacterLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CharacterLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CharacterLiterals.kt"); doTest(fileName); } @TestMetadata("checkType.kt") public void testCheckType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkType.kt"); doTest(fileName); } @TestMetadata("CompareToWithErrorType.kt") public void testCompareToWithErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt"); doTest(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constants.kt"); doTest(fileName); } @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constructors.kt"); doTest(fileName); } @TestMetadata("ConstructorsOfPrimitives.kt") public void testConstructorsOfPrimitives() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt"); doTest(fileName); } @TestMetadata("CovariantOverrideType.kt") public void testCovariantOverrideType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CovariantOverrideType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CovariantOverrideType.kt"); doTest(fileName); } @TestMetadata("DefaultValueForParameterInFunctionType.kt") public void testDefaultValueForParameterInFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DefaultValueForParameterInFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DefaultValueForParameterInFunctionType.kt"); doTest(fileName); } @TestMetadata("DefaultValuesTypechecking.kt") public void testDefaultValuesTypechecking() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt"); doTest(fileName); } @TestMetadata("DeferredTypes.kt") public void testDeferredTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeferredTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeferredTypes.kt"); doTest(fileName); } @TestMetadata("DeprecatedGetSetPropertyDelegateConvention.kt") public void testDeprecatedGetSetPropertyDelegateConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.kt"); doTest(fileName); } @TestMetadata("DeprecatedUnaryOperatorConventions.kt") public void testDeprecatedUnaryOperatorConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt"); doTest(fileName); } @TestMetadata("DiamondFunction.kt") public void testDiamondFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunction.kt"); doTest(fileName); } @TestMetadata("DiamondFunctionGeneric.kt") public void testDiamondFunctionGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunctionGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunctionGeneric.kt"); doTest(fileName); } @TestMetadata("DiamondProperty.kt") public void testDiamondProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondProperty.kt"); doTest(fileName); } @TestMetadata("Dollar.kt") public void testDollar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Dollar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Dollar.kt"); doTest(fileName); } @TestMetadata("fileDependencyRecursion.kt") public void testFileDependencyRecursion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/fileDependencyRecursion.kt"); doTest(fileName); } @TestMetadata("ForRangeConventions.kt") public void testForRangeConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ForRangeConventions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ForRangeConventions.kt"); doTest(fileName); } @TestMetadata("FreeFunctionCalledAsExtension.kt") public void testFreeFunctionCalledAsExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FreeFunctionCalledAsExtension.kt"); doTest(fileName); } @TestMetadata("FunctionCalleeExpressions.kt") public void testFunctionCalleeExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt"); doTest(fileName); } @TestMetadata("FunctionParameterWithoutType.kt") public void testFunctionParameterWithoutType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt"); doTest(fileName); } @TestMetadata("FunctionReturnTypes.kt") public void testFunctionReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionReturnTypes.kt"); doTest(fileName); } @TestMetadata("GenericArgumentConsistency.kt") public void testGenericArgumentConsistency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt"); doTest(fileName); } @TestMetadata("GenericFunctionIsLessSpecific.kt") public void testGenericFunctionIsLessSpecific() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.kt"); doTest(fileName); } @TestMetadata("implicitNothing.kt") public void testImplicitNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/implicitNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/implicitNothing.kt"); doTest(fileName); } @TestMetadata("IncDec.kt") public void testIncDec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncDec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncDec.kt"); doTest(fileName); } @TestMetadata("IncorrectCharacterLiterals.kt") public void testIncorrectCharacterLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt"); doTest(fileName); } @TestMetadata("InferNullabilityInThenBlock.kt") public void testInferNullabilityInThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.kt"); doTest(fileName); } @TestMetadata("Infix.kt") public void testInfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Infix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Infix.kt"); doTest(fileName); } @TestMetadata("InfixModifierApplicability.kt") public void testInfixModifierApplicability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/InfixModifierApplicability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/InfixModifierApplicability.kt"); doTest(fileName); } @TestMetadata("IsExpressions.kt") public void testIsExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IsExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IsExpressions.kt"); doTest(fileName); } @TestMetadata("kt310.kt") public void testKt310() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt310.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt310.kt"); doTest(fileName); } @TestMetadata("kt53.kt") public void testKt53() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt53.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt53.kt"); doTest(fileName); } @TestMetadata("LValueAssignment.kt") public void testLValueAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LValueAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LValueAssignment.kt"); doTest(fileName); } @TestMetadata("LateInit.kt") public void testLateInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInit.kt"); doTest(fileName); } @TestMetadata("LateInitSetter.kt") public void testLateInitSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInitSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LateInitSetter.kt"); doTest(fileName); } @TestMetadata("LiteralAsResult.kt") public void testLiteralAsResult() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LiteralAsResult.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LiteralAsResult.kt"); doTest(fileName); } @TestMetadata("LocalClassAndShortSubpackageNames.kt") public void testLocalClassAndShortSubpackageNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LocalClassAndShortSubpackageNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LocalClassAndShortSubpackageNames.kt"); doTest(fileName); } @TestMetadata("localInterfaces.kt") public void testLocalInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/localInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/localInterfaces.kt"); doTest(fileName); } @TestMetadata("MultilineStringTemplates.kt") public void testMultilineStringTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultilineStringTemplates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultilineStringTemplates.kt"); doTest(fileName); } @TestMetadata("MultipleBounds.kt") public void testMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultipleBounds.kt"); doTest(fileName); } @TestMetadata("NamedFunctionTypeParameterInSupertype.kt") public void testNamedFunctionTypeParameterInSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/NamedFunctionTypeParameterInSupertype.kt"); doTest(fileName); } @TestMetadata("Nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Nullability.kt"); doTest(fileName); } @TestMetadata("ObjectWithConstructor.kt") public void testObjectWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ObjectWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ObjectWithConstructor.kt"); doTest(fileName); } @TestMetadata("OperatorChecks.kt") public void testOperatorChecks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OperatorChecks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OperatorChecks.kt"); doTest(fileName); } @TestMetadata("Operators.kt") public void testOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Operators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Operators.kt"); doTest(fileName); } @TestMetadata("OperatorsWithWrongNames.kt") public void testOperatorsWithWrongNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OperatorsWithWrongNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OperatorsWithWrongNames.kt"); doTest(fileName); } @TestMetadata("OverrideFunctionWithParamDefaultValue.kt") public void testOverrideFunctionWithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("OverridenFunctionAndSpecifiedTypeParameter.kt") public void testOverridenFunctionAndSpecifiedTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.kt"); doTest(fileName); } @TestMetadata("OverridingVarByVal.kt") public void testOverridingVarByVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridingVarByVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridingVarByVal.kt"); doTest(fileName); } @TestMetadata("PackageAsExpression.kt") public void testPackageAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageAsExpression.kt"); doTest(fileName); } @TestMetadata("PackageInExpressionPosition.kt") public void testPackageInExpressionPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt"); doTest(fileName); } @TestMetadata("PackageInTypePosition.kt") public void testPackageInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageInTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageInTypePosition.kt"); doTest(fileName); } @TestMetadata("PackageQualified.kt") public void testPackageQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageQualified.kt"); doTest(fileName); } @TestMetadata("PrimaryConstructors.kt") public void testPrimaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PrimaryConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PrimaryConstructors.kt"); doTest(fileName); } @TestMetadata("PrivateFromOuterPackage.kt") public void testPrivateFromOuterPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt"); doTest(fileName); } @TestMetadata("ProcessingEmptyImport.kt") public void testProcessingEmptyImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProcessingEmptyImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProcessingEmptyImport.kt"); doTest(fileName); } @TestMetadata("ProjectionOnFunctionArgumentErrror.kt") public void testProjectionOnFunctionArgumentErrror() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.kt"); doTest(fileName); } @TestMetadata("ProjectionsInSupertypes.kt") public void testProjectionsInSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionsInSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionsInSupertypes.kt"); doTest(fileName); } @TestMetadata("Properties.kt") public void testProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Properties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Properties.kt"); doTest(fileName); } @TestMetadata("PropertyInitializers.kt") public void testPropertyInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PropertyInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PropertyInitializers.kt"); doTest(fileName); } @TestMetadata("QualifiedExpressions.kt") public void testQualifiedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/QualifiedExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/QualifiedExpressions.kt"); doTest(fileName); } @TestMetadata("RecursiveResolve.kt") public void testRecursiveResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/RecursiveResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/RecursiveResolve.kt"); doTest(fileName); } @TestMetadata("RecursiveTypeInference.kt") public void testRecursiveTypeInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/RecursiveTypeInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/RecursiveTypeInference.kt"); doTest(fileName); } @TestMetadata("ResolveOfJavaGenerics.kt") public void testResolveOfJavaGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt"); doTest(fileName); } @TestMetadata("ResolveToJava.kt") public void testResolveToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveToJava.kt"); doTest(fileName); } @TestMetadata("Return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Return.kt"); doTest(fileName); } @TestMetadata("SafeCallNonNullReceiver.kt") public void testSafeCallNonNullReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.kt"); doTest(fileName); } @TestMetadata("SafeCallNonNullReceiverReturnNull.kt") public void testSafeCallNonNullReceiverReturnNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt"); doTest(fileName); } @TestMetadata("SafeCallOnFakePackage.kt") public void testSafeCallOnFakePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt"); doTest(fileName); } @TestMetadata("SafeCallOnSuperReceiver.kt") public void testSafeCallOnSuperReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt"); doTest(fileName); } @TestMetadata("SelfTypesUnsupported.kt") public void testSelfTypesUnsupported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SelfTypesUnsupported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SelfTypesUnsupported.kt"); doTest(fileName); } @TestMetadata("Serializable.kt") public void testSerializable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Serializable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Serializable.kt"); doTest(fileName); } @TestMetadata("ShiftFunctionTypes.kt") public void testShiftFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt"); doTest(fileName); } @TestMetadata("StarsInFunctionCalls.kt") public void testStarsInFunctionCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt"); doTest(fileName); } @TestMetadata("StringPrefixAndSuffix.kt") public void testStringPrefixAndSuffix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringPrefixAndSuffix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringPrefixAndSuffix.kt"); doTest(fileName); } @TestMetadata("StringTemplates.kt") public void testStringTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringTemplates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringTemplates.kt"); doTest(fileName); } @TestMetadata("SupertypeListChecks.kt") public void testSupertypeListChecks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SupertypeListChecks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SupertypeListChecks.kt"); doTest(fileName); } @TestMetadata("SyntaxErrorInTestHighlighting.kt") public void testSyntaxErrorInTestHighlighting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.kt"); doTest(fileName); } @TestMetadata("SyntaxErrorInTestHighlightingEof.kt") public void testSyntaxErrorInTestHighlightingEof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.kt"); doTest(fileName); } @TestMetadata("TraitOverrideObjectMethods.kt") public void testTraitOverrideObjectMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt"); doTest(fileName); } @TestMetadata("TraitWithConstructor.kt") public void testTraitWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TraitWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TraitWithConstructor.kt"); doTest(fileName); } @TestMetadata("TypeInference.kt") public void testTypeInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeInference.kt"); doTest(fileName); } @TestMetadata("TypeMismatchOnOverrideWithSyntaxErrors.kt") public void testTypeMismatchOnOverrideWithSyntaxErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.kt"); doTest(fileName); } @TestMetadata("Underscore.kt") public void testUnderscore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Underscore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Underscore.kt"); doTest(fileName); } @TestMetadata("UnitByDefaultForFunctionTypes.kt") public void testUnitByDefaultForFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.kt"); doTest(fileName); } @TestMetadata("UnitValue.kt") public void testUnitValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitValue.kt"); doTest(fileName); } @TestMetadata("Unresolved.kt") public void testUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Unresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Unresolved.kt"); doTest(fileName); } @TestMetadata("UnusedParameters.kt") public void testUnusedParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnusedParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnusedParameters.kt"); doTest(fileName); } @TestMetadata("UnusedVariables.kt") public void testUnusedVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnusedVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnusedVariables.kt"); doTest(fileName); } @TestMetadata("ValAndFunOverrideCompatibilityClash.kt") public void testValAndFunOverrideCompatibilityClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.kt"); doTest(fileName); } @TestMetadata("VarargTypes.kt") public void testVarargTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/VarargTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/VarargTypes.kt"); doTest(fileName); } @TestMetadata("Varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Varargs.kt"); doTest(fileName); } @TestMetadata("Variance.kt") public void testVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Variance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Variance.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractJetDiagnosticsTest { + public static class Annotations extends AbstractDiagnosticsTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbigiousAnnotationConstructor.kt") public void testAmbigiousAnnotationConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt"); doTest(fileName); } @TestMetadata("AnnotatedConstructor.kt") public void testAnnotatedConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructor.kt"); doTest(fileName); } @TestMetadata("AnnotatedConstructorParams.kt") public void testAnnotatedConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt"); doTest(fileName); } @TestMetadata("AnnotatedLocalObjectFun.kt") public void testAnnotatedLocalObjectFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectFun.kt"); doTest(fileName); } @TestMetadata("AnnotatedLocalObjectProperty.kt") public void testAnnotatedLocalObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLocalObjectProperty.kt"); doTest(fileName); } @TestMetadata("AnnotatedLoop.kt") public void testAnnotatedLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedLoop.kt"); doTest(fileName); } @TestMetadata("AnnotatedResultType.kt") public void testAnnotatedResultType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedResultType.kt"); doTest(fileName); } @TestMetadata("AnnotatedTryCatch.kt") public void testAnnotatedTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedTryCatch.kt"); doTest(fileName); } @TestMetadata("AnnotationAsDefaultParameter.kt") public void testAnnotationAsDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationAsDefaultParameter.kt"); doTest(fileName); } @TestMetadata("AnnotationForClassTypeParameter.kt") public void testAnnotationForClassTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt"); doTest(fileName); } @TestMetadata("AnnotationForFunctionTypeParameter.kt") public void testAnnotationForFunctionTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt"); doTest(fileName); } @TestMetadata("AnnotationForObject.kt") public void testAnnotationForObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt"); doTest(fileName); } @TestMetadata("AnnotationIdentifier.kt") public void testAnnotationIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationIdentifier.kt"); doTest(fileName); } @TestMetadata("annotationInheritance.kt") public void testAnnotationInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationInheritance.kt"); doTest(fileName); } @TestMetadata("annotationModifier.kt") public void testAnnotationModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationModifier.kt"); doTest(fileName); } @TestMetadata("AnnotationOnObject.kt") public void testAnnotationOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationOnObject.kt"); doTest(fileName); } @TestMetadata("annotationOnParameterInFunctionType.kt") public void testAnnotationOnParameterInFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationOnParameterInFunctionType.kt"); doTest(fileName); } @TestMetadata("AnnotationsForClasses.kt") public void testAnnotationsForClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt"); doTest(fileName); } @TestMetadata("AnnotationsForPropertyTypeParameter.kt") public void testAnnotationsForPropertyTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt"); doTest(fileName); } @TestMetadata("annotationsOnLambdaAsCallArgument.kt") public void testAnnotationsOnLambdaAsCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationsOnLambdaAsCallArgument.kt"); doTest(fileName); } @TestMetadata("annotationsOnNullableTypes.kt") public void testAnnotationsOnNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.kt"); doTest(fileName); } @TestMetadata("atAnnotationResolve.kt") public void testAtAnnotationResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/atAnnotationResolve.kt"); doTest(fileName); } @TestMetadata("BasicAnnotations.kt") public void testBasicAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/BasicAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/BasicAnnotations.kt"); doTest(fileName); } @TestMetadata("ConstructorCall.kt") public void testConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt"); doTest(fileName); } @TestMetadata("DanglingInScript.kt") public void testDanglingInScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingInScript.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingInScript.kt"); doTest(fileName); } @TestMetadata("DanglingMixed.kt") public void testDanglingMixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt"); doTest(fileName); } @TestMetadata("DanglingNoBrackets.kt") public void testDanglingNoBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingNoBrackets.kt"); doTest(fileName); } @TestMetadata("DanglingWithBrackets.kt") public void testDanglingWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/DanglingWithBrackets.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/Deprecated.kt"); doTest(fileName); } @TestMetadata("extensionFunctionType.kt") public void testExtensionFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/extensionFunctionType.kt"); doTest(fileName); } @TestMetadata("forParameterAnnotationResolve.kt") public void testForParameterAnnotationResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/forParameterAnnotationResolve.kt"); doTest(fileName); } @TestMetadata("invalidTypesInAnnotationConstructor.kt") public void testInvalidTypesInAnnotationConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.kt"); doTest(fileName); } @TestMetadata("JavaAnnotationConstructors.kt") public void testJavaAnnotationConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.kt"); doTest(fileName); } @TestMetadata("kt1860-negative.kt") public void testKt1860_negative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt"); doTest(fileName); } @TestMetadata("kt1860-positive.kt") public void testKt1860_positive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt"); doTest(fileName); } @TestMetadata("kt1886annotationBody.kt") public void testKt1886annotationBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt"); doTest(fileName); } @TestMetadata("missingValOnParameter.kt") public void testMissingValOnParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/missingValOnParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/missingValOnParameter.kt"); doTest(fileName); } @TestMetadata("MultiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/MultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/MultiDeclaration.kt"); doTest(fileName); } @TestMetadata("MutuallyRecursivelyAnnotatedGlobalFunction.kt") public void testMutuallyRecursivelyAnnotatedGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/MutuallyRecursivelyAnnotatedGlobalFunction.kt"); doTest(fileName); } @TestMetadata("noNameProperty.kt") public void testNoNameProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/noNameProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/noNameProperty.kt"); doTest(fileName); } @TestMetadata("NonAnnotationClass.kt") public void testNonAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.kt"); doTest(fileName); } @TestMetadata("onExpression.kt") public void testOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onExpression.kt"); doTest(fileName); } @TestMetadata("onFunctionParameter.kt") public void testOnFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onFunctionParameter.kt"); doTest(fileName); } @TestMetadata("onInitializer.kt") public void testOnInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onInitializer.kt"); doTest(fileName); } @TestMetadata("onLoops.kt") public void testOnLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoops.kt"); doTest(fileName); } @TestMetadata("onLoopsUnreachable.kt") public void testOnLoopsUnreachable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.kt"); doTest(fileName); } @TestMetadata("onMultiDeclaration.kt") public void testOnMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotated.kt") public void testRecursivelyAnnotated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotated.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedFunctionParameter.kt") public void testRecursivelyAnnotatedFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedFunctionParameter.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedGlobalFunction.kt") public void testRecursivelyAnnotatedGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalFunction.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedGlobalProperty.kt") public void testRecursivelyAnnotatedGlobalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedGlobalProperty.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedParameter.kt") public void testRecursivelyAnnotatedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameter.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedParameterType.kt") public void testRecursivelyAnnotatedParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterType.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedParameterWithAt.kt") public void testRecursivelyAnnotatedParameterWithAt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedParameterWithAt.kt"); doTest(fileName); } @TestMetadata("RecursivelyAnnotatedProperty.kt") public void testRecursivelyAnnotatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyAnnotatedProperty.kt"); doTest(fileName); } @TestMetadata("RecursivelyIncorrectlyAnnotatedParameter.kt") public void testRecursivelyIncorrectlyAnnotatedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt"); doTest(fileName); } @TestMetadata("typeAnnotations.kt") public void testTypeAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/typeAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/typeAnnotations.kt"); doTest(fileName); } @TestMetadata("typeParameterAsAnnotation.kt") public void testTypeParameterAsAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt"); doTest(fileName); } @TestMetadata("UnresolvedAnnotationOnObject.kt") public void testUnresolvedAnnotationOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.kt"); doTest(fileName); } @TestMetadata("unresolvedReferenceRange.kt") public void testUnresolvedReferenceRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.kt"); doTest(fileName); } @TestMetadata("WrongAnnotationArgsOnObject.kt") public void testWrongAnnotationArgsOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTest { + public static class AnnotationParameterMustBeConstant extends AbstractDiagnosticsTest { public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("booleanLocalVal.kt") public void testBooleanLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt"); doTest(fileName); } @TestMetadata("compareAndEquals.kt") public void testCompareAndEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt"); doTest(fileName); } @TestMetadata("enumConst.kt") public void testEnumConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt"); doTest(fileName); } @TestMetadata("javaProperties.kt") public void testJavaProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.kt"); doTest(fileName); } @TestMetadata("kotlinProperties.kt") public void testKotlinProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.kt"); doTest(fileName); } @TestMetadata("strings.kt") public void testStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt"); doTest(fileName); } } @@ -1125,250 +1125,250 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/annotations/options") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Options extends AbstractJetDiagnosticsTest { + public static class Options extends AbstractDiagnosticsTest { public void testAllFilesPresentInOptions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/options"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/options"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationAsArg.kt") public void testAnnotationAsArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/annotationAsArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/annotationAsArg.kt"); doTest(fileName); } @TestMetadata("annotationAsArgComplex.kt") public void testAnnotationAsArgComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/annotationAsArgComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/annotationAsArgComplex.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/assignment.kt"); doTest(fileName); } @TestMetadata("documented.kt") public void testDocumented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/documented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/documented.kt"); doTest(fileName); } @TestMetadata("forParam.kt") public void testForParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/forParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/forParam.kt"); doTest(fileName); } @TestMetadata("functionExpression.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/functionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/functionExpression.kt"); doTest(fileName); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/functions.kt"); doTest(fileName); } @TestMetadata("javaDocumented.kt") public void testJavaDocumented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaDocumented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaDocumented.kt"); doTest(fileName); } @TestMetadata("javaKotlinTargetRetention.kt") public void testJavaKotlinTargetRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaKotlinTargetRetention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaKotlinTargetRetention.kt"); doTest(fileName); } @TestMetadata("javaretention.kt") public void testJavaretention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaretention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/javaretention.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("objectLiteral.kt") public void testObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/objectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/objectLiteral.kt"); doTest(fileName); } @TestMetadata("prefix.kt") public void testPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/prefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/prefix.kt"); doTest(fileName); } @TestMetadata("repeatable.kt") public void testRepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/repeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/repeatable.kt"); doTest(fileName); } @TestMetadata("retention.kt") public void testRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/retention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/retention.kt"); doTest(fileName); } @TestMetadata("setterParam.kt") public void testSetterParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/setterParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/setterParam.kt"); doTest(fileName); } @TestMetadata("target.kt") public void testTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/target.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/target.kt"); doTest(fileName); } @TestMetadata("unrepeatable.kt") public void testUnrepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/unrepeatable.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/annotations/options/targets") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Targets extends AbstractJetDiagnosticsTest { + public static class Targets extends AbstractDiagnosticsTest { @TestMetadata("accessors.kt") public void testAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/accessors.kt"); doTest(fileName); } public void testAllFilesPresentInTargets() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/options/targets"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/options/targets"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/annotation.kt"); doTest(fileName); } @TestMetadata("classifier.kt") public void testClassifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/classifier.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/constructor.kt"); doTest(fileName); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/empty.kt"); doTest(fileName); } @TestMetadata("expr.kt") public void testExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/expr.kt"); doTest(fileName); } @TestMetadata("file.kt") public void testFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/file.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/file.kt"); doTest(fileName); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/function.kt"); doTest(fileName); } @TestMetadata("funtypeargs.kt") public void testFuntypeargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/funtypeargs.kt"); doTest(fileName); } @TestMetadata("incorrect.kt") public void testIncorrect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/incorrect.kt"); doTest(fileName); } @TestMetadata("init.kt") public void testInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/init.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/init.kt"); doTest(fileName); } @TestMetadata("java.kt") public void testJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/java.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/java.kt"); doTest(fileName); } @TestMetadata("local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/local.kt"); doTest(fileName); } @TestMetadata("nested.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/nested.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/property.kt"); doTest(fileName); } @TestMetadata("returntype.kt") public void testReturntype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/returntype.kt"); doTest(fileName); } @TestMetadata("suppress.kt") public void testSuppress() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/suppress.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/suppress.kt"); doTest(fileName); } @TestMetadata("type.kt") public void testType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/type.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/type.kt"); doTest(fileName); } @TestMetadata("typeParams.kt") public void testTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/typeParams.kt"); doTest(fileName); } @TestMetadata("typeargs.kt") public void testTypeargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.kt"); doTest(fileName); } @TestMetadata("valueparam.kt") public void testValueparam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/options/targets/valueparam.kt"); doTest(fileName); } } @@ -1377,62 +1377,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class WithUseSiteTarget extends AbstractJetDiagnosticsTest { + public static class WithUseSiteTarget extends AbstractDiagnosticsTest { public void testAllFilesPresentInWithUseSiteTarget() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FieldAnnotations.kt") public void testFieldAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt"); doTest(fileName); } @TestMetadata("FileAnnotations.kt") public void testFileAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FileAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FileAnnotations.kt"); doTest(fileName); } @TestMetadata("GetterAnnotations.kt") public void testGetterAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt"); doTest(fileName); } @TestMetadata("ParamAnnotations.kt") public void testParamAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ParamAnnotations.kt"); doTest(fileName); } @TestMetadata("PropertyAnnotations.kt") public void testPropertyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt"); doTest(fileName); } @TestMetadata("ReceiverAnnotations.kt") public void testReceiverAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/ReceiverAnnotations.kt"); doTest(fileName); } @TestMetadata("repeatable.kt") public void testRepeatable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/repeatable.kt"); doTest(fileName); } @TestMetadata("SetterAnnotations.kt") public void testSetterAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt"); doTest(fileName); } @TestMetadata("SparamAnnotations.kt") public void testSparamAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt"); doTest(fileName); } } @@ -1441,116 +1441,116 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/backingField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BackingField extends AbstractJetDiagnosticsTest { + public static class BackingField extends AbstractDiagnosticsTest { public void testAllFilesPresentInBackingField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CustomGetSet.kt") public void testCustomGetSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt"); doTest(fileName); } @TestMetadata("CustomGetVal.kt") public void testCustomGetVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt"); doTest(fileName); } @TestMetadata("CustomGetValGlobal.kt") public void testCustomGetValGlobal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.kt"); doTest(fileName); } @TestMetadata("CustomGetVar.kt") public void testCustomGetVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVar.kt"); doTest(fileName); } @TestMetadata("CustomSet.kt") public void testCustomSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomSet.kt"); doTest(fileName); } @TestMetadata("ExtensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt"); doTest(fileName); } @TestMetadata("FieldAsParam.kt") public void testFieldAsParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldAsParam.kt"); doTest(fileName); } @TestMetadata("FieldAsProperty.kt") public void testFieldAsProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldAsProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldAsProperty.kt"); doTest(fileName); } @TestMetadata("FieldDerived.kt") public void testFieldDerived() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldDerived.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldDerived.kt"); doTest(fileName); } @TestMetadata("FieldInInterface.kt") public void testFieldInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldInInterface.kt"); doTest(fileName); } @TestMetadata("FieldInLocal.kt") public void testFieldInLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldInLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldInLocal.kt"); doTest(fileName); } @TestMetadata("FieldOnVal.kt") public void testFieldOnVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldOnVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldOnVal.kt"); doTest(fileName); } @TestMetadata("FieldOnVar.kt") public void testFieldOnVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldOnVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldOnVar.kt"); doTest(fileName); } @TestMetadata("FieldReassignment.kt") public void testFieldReassignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldReassignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldReassignment.kt"); doTest(fileName); } @TestMetadata("FieldShadow.kt") public void testFieldShadow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldShadow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/FieldShadow.kt"); doTest(fileName); } @TestMetadata("InitCustomSetter.kt") public void testInitCustomSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/InitCustomSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/InitCustomSetter.kt"); doTest(fileName); } @TestMetadata("InitOpenSetter.kt") public void testInitOpenSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/InitOpenSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/InitOpenSetter.kt"); doTest(fileName); } @TestMetadata("kt782packageLevel.kt") public void testKt782packageLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt"); doTest(fileName); } } @@ -1558,322 +1558,322 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/callableReference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CallableReference extends AbstractJetDiagnosticsTest { + public static class CallableReference extends AbstractDiagnosticsTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyLhs.kt") public void testEmptyLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/emptyLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/emptyLhs.kt"); doTest(fileName); } @TestMetadata("kt7430_wrongClassOnLHS.kt") public void testKt7430_wrongClassOnLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/kt7430_wrongClassOnLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/kt7430_wrongClassOnLHS.kt"); doTest(fileName); } @TestMetadata("objectMembersUnsupported.kt") public void testObjectMembersUnsupported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/objectMembersUnsupported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/objectMembersUnsupported.kt"); doTest(fileName); } @TestMetadata("unused.kt") public void testUnused() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/unused.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/unused.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/callableReference/function") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Function extends AbstractJetDiagnosticsTest { + public static class Function extends AbstractDiagnosticsTest { @TestMetadata("abstractClassConstructors.kt") public void testAbstractClassConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/abstractClassConstructors.kt"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguityTopLevelVsTopLevel.kt") public void testAmbiguityTopLevelVsTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt"); doTest(fileName); } @TestMetadata("callableRefrenceOnNestedObject.kt") public void testCallableRefrenceOnNestedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/callableRefrenceOnNestedObject.kt"); doTest(fileName); } @TestMetadata("constructorFromClass.kt") public void testConstructorFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromClass.kt"); doTest(fileName); } @TestMetadata("constructorFromCompanion.kt") public void testConstructorFromCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromCompanion.kt"); doTest(fileName); } @TestMetadata("constructorFromExtension.kt") public void testConstructorFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtension.kt"); doTest(fileName); } @TestMetadata("constructorFromExtensionInClass.kt") public void testConstructorFromExtensionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromExtensionInClass.kt"); doTest(fileName); } @TestMetadata("constructorFromTopLevel.kt") public void testConstructorFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/constructorFromTopLevel.kt"); doTest(fileName); } @TestMetadata("differentPackageClass.kt") public void testDifferentPackageClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageClass.kt"); doTest(fileName); } @TestMetadata("differentPackageExtension.kt") public void testDifferentPackageExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageExtension.kt"); doTest(fileName); } @TestMetadata("differentPackageTopLevel.kt") public void testDifferentPackageTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/differentPackageTopLevel.kt"); doTest(fileName); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/empty.kt"); doTest(fileName); } @TestMetadata("extensionFromTopLevel.kt") public void testExtensionFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionFromTopLevel.kt"); doTest(fileName); } @TestMetadata("extensionInClassDisallowed.kt") public void testExtensionInClassDisallowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionInClassDisallowed.kt"); doTest(fileName); } @TestMetadata("extensionOnNullable.kt") public void testExtensionOnNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionOnNullable.kt"); doTest(fileName); } @TestMetadata("extensionToSupertype.kt") public void testExtensionToSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt"); doTest(fileName); } @TestMetadata("fakeOverrideType.kt") public void testFakeOverrideType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/fakeOverrideType.kt"); doTest(fileName); } @TestMetadata("genericClassFromTopLevel.kt") public void testGenericClassFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/genericClassFromTopLevel.kt"); doTest(fileName); } @TestMetadata("importedInnerConstructor.kt") public void testImportedInnerConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/importedInnerConstructor.kt"); doTest(fileName); } @TestMetadata("innerConstructorFromClass.kt") public void testInnerConstructorFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromClass.kt"); doTest(fileName); } @TestMetadata("innerConstructorFromExtension.kt") public void testInnerConstructorFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromExtension.kt"); doTest(fileName); } @TestMetadata("innerConstructorFromTopLevel.kt") public void testInnerConstructorFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/innerConstructorFromTopLevel.kt"); doTest(fileName); } @TestMetadata("javaStaticMethod.kt") public void testJavaStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/javaStaticMethod.kt"); doTest(fileName); } @TestMetadata("lhsNotAClass.kt") public void testLhsNotAClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt"); doTest(fileName); } @TestMetadata("localConstructor.kt") public void testLocalConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructor.kt"); doTest(fileName); } @TestMetadata("localConstructorFromExtensionInLocalClass.kt") public void testLocalConstructorFromExtensionInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromExtensionInLocalClass.kt"); doTest(fileName); } @TestMetadata("localConstructorFromLocalClass.kt") public void testLocalConstructorFromLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalClass.kt"); doTest(fileName); } @TestMetadata("localConstructorFromLocalExtension.kt") public void testLocalConstructorFromLocalExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localConstructorFromLocalExtension.kt"); doTest(fileName); } @TestMetadata("localNamedFun.kt") public void testLocalNamedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFun.kt"); doTest(fileName); } @TestMetadata("localNamedFunFromExtensionInLocalClass.kt") public void testLocalNamedFunFromExtensionInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromExtensionInLocalClass.kt"); doTest(fileName); } @TestMetadata("localNamedFunFromLocalClass.kt") public void testLocalNamedFunFromLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalClass.kt"); doTest(fileName); } @TestMetadata("localNamedFunFromLocalExtension.kt") public void testLocalNamedFunFromLocalExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/localNamedFunFromLocalExtension.kt"); doTest(fileName); } @TestMetadata("longQualifiedName.kt") public void testLongQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedName.kt"); doTest(fileName); } @TestMetadata("longQualifiedNameGeneric.kt") public void testLongQualifiedNameGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/longQualifiedNameGeneric.kt"); doTest(fileName); } @TestMetadata("memberFromTopLevel.kt") public void testMemberFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/memberFromTopLevel.kt"); doTest(fileName); } @TestMetadata("nestedConstructorFromClass.kt") public void testNestedConstructorFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromClass.kt"); doTest(fileName); } @TestMetadata("nestedConstructorFromExtension.kt") public void testNestedConstructorFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromExtension.kt"); doTest(fileName); } @TestMetadata("nestedConstructorFromTopLevel.kt") public void testNestedConstructorFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/nestedConstructorFromTopLevel.kt"); doTest(fileName); } @TestMetadata("noAmbiguityLocalVsTopLevel.kt") public void testNoAmbiguityLocalVsTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityLocalVsTopLevel.kt"); doTest(fileName); } @TestMetadata("noAmbiguityMemberVsExtension.kt") public void testNoAmbiguityMemberVsExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsExtension.kt"); doTest(fileName); } @TestMetadata("noAmbiguityMemberVsTopLevel.kt") public void testNoAmbiguityMemberVsTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/noAmbiguityMemberVsTopLevel.kt"); doTest(fileName); } @TestMetadata("renameOnImport.kt") public void testRenameOnImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/renameOnImport.kt"); doTest(fileName); } @TestMetadata("topLevelFromClass.kt") public void testTopLevelFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromClass.kt"); doTest(fileName); } @TestMetadata("topLevelFromExtension.kt") public void testTopLevelFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtension.kt"); doTest(fileName); } @TestMetadata("topLevelFromExtensionInClass.kt") public void testTopLevelFromExtensionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromExtensionInClass.kt"); doTest(fileName); } @TestMetadata("topLevelFromTopLevel.kt") public void testTopLevelFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/topLevelFromTopLevel.kt"); doTest(fileName); } @TestMetadata("unresolved.kt") public void testUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt"); doTest(fileName); } } @@ -1881,104 +1881,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/callableReference/property") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Property extends AbstractJetDiagnosticsTest { + public static class Property extends AbstractDiagnosticsTest { @TestMetadata("abstractPropertyViaSubclasses.kt") public void testAbstractPropertyViaSubclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/abstractPropertyViaSubclasses.kt"); doTest(fileName); } @TestMetadata("accessViaSubclass.kt") public void testAccessViaSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/accessViaSubclass.kt"); doTest(fileName); } public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classFromClass.kt") public void testClassFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/classFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/classFromClass.kt"); doTest(fileName); } @TestMetadata("extensionFromTopLevel.kt") public void testExtensionFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionFromTopLevel.kt"); doTest(fileName); } @TestMetadata("extensionPropertyOnNullable.kt") public void testExtensionPropertyOnNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/extensionPropertyOnNullable.kt"); doTest(fileName); } @TestMetadata("genericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/genericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/genericClass.kt"); doTest(fileName); } @TestMetadata("javaInstanceField.kt") public void testJavaInstanceField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaInstanceField.kt"); doTest(fileName); } @TestMetadata("javaStaticFieldViaImport.kt") public void testJavaStaticFieldViaImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/javaStaticFieldViaImport.kt"); doTest(fileName); } @TestMetadata("kt7564.kt") public void testKt7564() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/kt7564.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/kt7564.kt"); doTest(fileName); } @TestMetadata("kt7945_unrelatedClass.kt") public void testKt7945_unrelatedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt"); doTest(fileName); } @TestMetadata("localVariable.kt") public void testLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/localVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/localVariable.kt"); doTest(fileName); } @TestMetadata("memberFromTopLevel.kt") public void testMemberFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.kt"); doTest(fileName); } @TestMetadata("returnTypeDependentOnGenericProperty.kt") public void testReturnTypeDependentOnGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/returnTypeDependentOnGenericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/returnTypeDependentOnGenericProperty.kt"); doTest(fileName); } @TestMetadata("samePriorityForFunctionsAndProperties.kt") public void testSamePriorityForFunctionsAndProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/samePriorityForFunctionsAndProperties.kt"); doTest(fileName); } @TestMetadata("syntheticProperties.kt") public void testSyntheticProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/syntheticProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/syntheticProperties.kt"); doTest(fileName); } @TestMetadata("topLevelFromTopLevel.kt") public void testTopLevelFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/property/topLevelFromTopLevel.kt"); doTest(fileName); } } @@ -1986,80 +1986,80 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/callableReference/resolve") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Resolve extends AbstractJetDiagnosticsTest { + public static class Resolve extends AbstractDiagnosticsTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/resolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/callableReference/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("byArgType.kt") public void testByArgType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byArgType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byArgType.kt"); doTest(fileName); } @TestMetadata("byGenericArgType.kt") public void testByGenericArgType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt"); doTest(fileName); } @TestMetadata("byValType.kt") public void testByValType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byValType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/byValType.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/constructor.kt"); doTest(fileName); } @TestMetadata("overloads.kt") public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt"); doTest(fileName); } @TestMetadata("overloadsMember.kt") public void testOverloadsMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/overloadsMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/overloadsMember.kt"); doTest(fileName); } @TestMetadata("valVsFun.kt") public void testValVsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/valVsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/valVsFun.kt"); doTest(fileName); } @TestMetadata("withAs.kt") public void testWithAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withAs.kt"); doTest(fileName); } @TestMetadata("withExtFun.kt") public void testWithExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withExtFun.kt"); doTest(fileName); } @TestMetadata("withGenericFun.kt") public void testWithGenericFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt"); doTest(fileName); } @TestMetadata("withPlaceholderTypes.kt") public void testWithPlaceholderTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt"); doTest(fileName); } @TestMetadata("withVararg.kt") public void testWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/callableReference/resolve/withVararg.kt"); doTest(fileName); } } @@ -2068,388 +2068,388 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Cast extends AbstractJetDiagnosticsTest { + public static class Cast extends AbstractDiagnosticsTest { public void testAllFilesPresentInCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AsArray.kt") public void testAsArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsArray.kt"); doTest(fileName); } @TestMetadata("AsErasedError.kt") public void testAsErasedError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedError.kt"); doTest(fileName); } @TestMetadata("AsErasedFine.kt") public void testAsErasedFine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedFine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedFine.kt"); doTest(fileName); } @TestMetadata("AsErasedStar.kt") public void testAsErasedStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedStar.kt"); doTest(fileName); } @TestMetadata("AsErasedWarning.kt") public void testAsErasedWarning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt"); doTest(fileName); } @TestMetadata("constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/constants.kt"); doTest(fileName); } @TestMetadata("DowncastMap.kt") public void testDowncastMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/DowncastMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/DowncastMap.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt") public void testIsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForExactSupertypeCheck.kt") public void testIsErasedAllowForExactSupertypeCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForOverridenVarianceWithProjection.kt") public void testIsErasedAllowForOverridenVarianceWithProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForSupertypeCheckWithContrvariance.kt") public void testIsErasedAllowForSupertypeCheckWithContrvariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForSupertypeCheckWithCovariance.kt") public void testIsErasedAllowForSupertypeCheckWithCovariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForTypeWithIrrelevantMixin.kt") public void testIsErasedAllowForTypeWithIrrelevantMixin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt") public void testIsErasedAllowForTypeWithTwoSameTypeSubstitutions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowForTypeWithoutTypeArguments.kt") public void testIsErasedAllowForTypeWithoutTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowFromOut.kt") public void testIsErasedAllowFromOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowFromOut2.kt") public void testIsErasedAllowFromOut2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowFromOutAtClass.kt") public void testIsErasedAllowFromOutAtClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowParameterSubtype.kt") public void testIsErasedAllowParameterSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowSameClassParameter.kt") public void testIsErasedAllowSameClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt"); doTest(fileName); } @TestMetadata("IsErasedAllowSameParameterParameter.kt") public void testIsErasedAllowSameParameterParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt"); doTest(fileName); } @TestMetadata("isErasedAnyAndStarred.kt") public void testIsErasedAnyAndStarred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowDifferentArgInvariantPosition.kt") public void testIsErasedDisallowDifferentArgInvariantPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowForOverridenVariance.kt") public void testIsErasedDisallowForOverridenVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowForTypeWithConstraints.kt") public void testIsErasedDisallowForTypeWithConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowFromAny.kt") public void testIsErasedDisallowFromAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowFromIn.kt") public void testIsErasedDisallowFromIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowFromOut.kt") public void testIsErasedDisallowFromOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt"); doTest(fileName); } @TestMetadata("IsErasedDisallowFromOutAtClass.kt") public void testIsErasedDisallowFromOutAtClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.kt"); doTest(fileName); } @TestMetadata("IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt") public void testIsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt"); doTest(fileName); } @TestMetadata("IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt") public void testIsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt"); doTest(fileName); } @TestMetadata("IsErasedNonGeneric.kt") public void testIsErasedNonGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.kt"); doTest(fileName); } @TestMetadata("IsErasedNullableTasT.kt") public void testIsErasedNullableTasT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.kt"); doTest(fileName); } @TestMetadata("IsErasedStar.kt") public void testIsErasedStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedStar.kt"); doTest(fileName); } @TestMetadata("isErasedTAndStarred.kt") public void testIsErasedTAndStarred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.kt"); doTest(fileName); } @TestMetadata("IsErasedTasT.kt") public void testIsErasedTasT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedTasT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedTasT.kt"); doTest(fileName); } @TestMetadata("IsErasedToErrorType.kt") public void testIsErasedToErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.kt"); doTest(fileName); } @TestMetadata("isErasedUnrelatedAndStarred.kt") public void testIsErasedUnrelatedAndStarred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.kt"); doTest(fileName); } @TestMetadata("IsRecursionSustainable.kt") public void testIsRecursionSustainable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.kt"); doTest(fileName); } @TestMetadata("IsTraits.kt") public void testIsTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsTraits.kt"); doTest(fileName); } @TestMetadata("kt614.kt") public void testKt614() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/kt614.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/kt614.kt"); doTest(fileName); } @TestMetadata("WhenErasedDisallowFromAny.kt") public void testWhenErasedDisallowFromAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt"); doTest(fileName); } @TestMetadata("WhenWithExpression.kt") public void testWhenWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/cast/bare") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Bare extends AbstractJetDiagnosticsTest { + public static class Bare extends AbstractDiagnosticsTest { public void testAllFilesPresentInBare() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/bare"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/bare"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AsNestedBare.kt") public void testAsNestedBare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.kt"); doTest(fileName); } @TestMetadata("AsNullable.kt") public void testAsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullable.kt"); doTest(fileName); } @TestMetadata("AsNullableNotEnough.kt") public void testAsNullableNotEnough() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.kt"); doTest(fileName); } @TestMetadata("EitherAs.kt") public void testEitherAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherAs.kt"); doTest(fileName); } @TestMetadata("EitherIs.kt") public void testEitherIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherIs.kt"); doTest(fileName); } @TestMetadata("EitherNotIs.kt") public void testEitherNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.kt"); doTest(fileName); } @TestMetadata("EitherSafeAs.kt") public void testEitherSafeAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.kt"); doTest(fileName); } @TestMetadata("EitherWhen.kt") public void testEitherWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherWhen.kt"); doTest(fileName); } @TestMetadata("ErrorsInSubstitution.kt") public void testErrorsInSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.kt"); doTest(fileName); } @TestMetadata("FromErrorType.kt") public void testFromErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/FromErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/FromErrorType.kt"); doTest(fileName); } @TestMetadata("NullableAs.kt") public void testNullableAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAs.kt"); doTest(fileName); } @TestMetadata("NullableAsNotEnough.kt") public void testNullableAsNotEnough() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.kt"); doTest(fileName); } @TestMetadata("NullableAsNullable.kt") public void testNullableAsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.kt"); doTest(fileName); } @TestMetadata("NullableAsNullableNotEnough.kt") public void testNullableAsNullableNotEnough() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.kt"); doTest(fileName); } @TestMetadata("RedundantNullable.kt") public void testRedundantNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.kt"); doTest(fileName); } @TestMetadata("ToErrorType.kt") public void testToErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ToErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ToErrorType.kt"); doTest(fileName); } @TestMetadata("UnrelatedAs.kt") public void testUnrelatedAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.kt"); doTest(fileName); } @TestMetadata("UnrelatedColon.kt") public void testUnrelatedColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.kt"); doTest(fileName); } @TestMetadata("UnrelatedIs.kt") public void testUnrelatedIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.kt"); doTest(fileName); } } @@ -2457,38 +2457,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NeverSucceeds extends AbstractJetDiagnosticsTest { + public static class NeverSucceeds extends AbstractDiagnosticsTest { public void testAllFilesPresentInNeverSucceeds() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/neverSucceeds"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/neverSucceeds"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CastToNotNullSuper.kt") public void testCastToNotNullSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.kt"); doTest(fileName); } @TestMetadata("MappedDirect.kt") public void testMappedDirect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt"); doTest(fileName); } @TestMetadata("MappedSubtypes.kt") public void testMappedSubtypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt"); doTest(fileName); } @TestMetadata("NoGenericsRelated.kt") public void testNoGenericsRelated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt"); doTest(fileName); } @TestMetadata("NoGenericsUnrelated.kt") public void testNoGenericsUnrelated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt"); doTest(fileName); } } @@ -2497,38 +2497,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/checkArguments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CheckArguments extends AbstractJetDiagnosticsTest { + public static class CheckArguments extends AbstractDiagnosticsTest { public void testAllFilesPresentInCheckArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/checkArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/checkArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("booleanExpressions.kt") public void testBooleanExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt"); doTest(fileName); } @TestMetadata("kt1897_diagnostic_part.kt") public void testKt1897_diagnostic_part() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt"); doTest(fileName); } @TestMetadata("kt1940.kt") public void testKt1940() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1940.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1940.kt"); doTest(fileName); } @TestMetadata("overloadedFunction.kt") public void testOverloadedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt"); doTest(fileName); } @TestMetadata("SpreadVarargs.kt") public void testSpreadVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt"); doTest(fileName); } } @@ -2536,50 +2536,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/classLiteral") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassLiteral extends AbstractJetDiagnosticsTest { + public static class ClassLiteral extends AbstractDiagnosticsTest { public void testAllFilesPresentInClassLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classLiteral"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classLiteral"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrays.kt") public void testArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/arrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/arrays.kt"); doTest(fileName); } @TestMetadata("classLiteralType.kt") public void testClassLiteralType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/classLiteralType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/classLiteralType.kt"); doTest(fileName); } @TestMetadata("genericArrays.kt") public void testGenericArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/genericArrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/genericArrays.kt"); doTest(fileName); } @TestMetadata("genericClasses.kt") public void testGenericClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/genericClasses.kt"); doTest(fileName); } @TestMetadata("nonClassesOnLHS.kt") public void testNonClassesOnLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/nonClassesOnLHS.kt"); doTest(fileName); } @TestMetadata("simpleClassLiteral.kt") public void testSimpleClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/simpleClassLiteral.kt"); doTest(fileName); } @TestMetadata("unresolvedClass.kt") public void testUnresolvedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classLiteral/unresolvedClass.kt"); doTest(fileName); } } @@ -2587,110 +2587,110 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/classObjects") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassObjects extends AbstractJetDiagnosticsTest { + public static class ClassObjects extends AbstractDiagnosticsTest { public void testAllFilesPresentInClassObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("builtInClassObjects.kt") public void testBuiltInClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/builtInClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/builtInClassObjects.kt"); doTest(fileName); } @TestMetadata("ClassObjectCannotAccessClassFields.kt") public void testClassObjectCannotAccessClassFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt"); doTest(fileName); } @TestMetadata("classObjectHeader.kt") public void testClassObjectHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectHeader.kt"); doTest(fileName); } @TestMetadata("classObjectInLocalClass.kt") public void testClassObjectInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt"); doTest(fileName); } @TestMetadata("classObjectRedeclaration.kt") public void testClassObjectRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectRedeclaration.kt"); doTest(fileName); } @TestMetadata("ClassObjectVisibility.kt") public void testClassObjectVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjects.kt") public void testClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt"); doTest(fileName); } @TestMetadata("companionObjectOfPrivateClassVisibility.kt") public void testCompanionObjectOfPrivateClassVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/companionObjectOfPrivateClassVisibility.kt"); doTest(fileName); } @TestMetadata("importClassInClassObject.kt") public void testImportClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt"); doTest(fileName); } @TestMetadata("InnerClassAccessThroughClassObject.kt") public void testInnerClassAccessThroughClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt"); doTest(fileName); } @TestMetadata("InnerClassAccessThroughEnum.kt") public void testInnerClassAccessThroughEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt"); doTest(fileName); } @TestMetadata("InnerClassClassObject.kt") public void testInnerClassClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt"); doTest(fileName); } @TestMetadata("invisibleClassObjects.kt") public void testInvisibleClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt"); doTest(fileName); } @TestMetadata("kt3866.kt") public void testKt3866() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/kt3866.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/kt3866.kt"); doTest(fileName); } @TestMetadata("multipleDissallowedDefaultObjects.kt") public void testMultipleDissallowedDefaultObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.kt"); doTest(fileName); } @TestMetadata("nestedClassInPrivateClassObject.kt") public void testNestedClassInPrivateClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt"); doTest(fileName); } @TestMetadata("resolveFunctionInsideClassObject.kt") public void testResolveFunctionInsideClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/resolveFunctionInsideClassObject.kt"); doTest(fileName); } } @@ -2698,442 +2698,442 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest { + public static class ControlFlowAnalysis extends AbstractDiagnosticsTest { public void testAllFilesPresentInControlFlowAnalysis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("backingFieldInsideGetter.kt") public void testBackingFieldInsideGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.kt"); doTest(fileName); } @TestMetadata("breakOrContinueInLoopCondition.kt") public void testBreakOrContinueInLoopCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.kt"); doTest(fileName); } @TestMetadata("checkInnerLocalDeclarations.kt") public void testCheckInnerLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.kt"); doTest(fileName); } @TestMetadata("checkPropertyAccessor.kt") public void testCheckPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("definiteReturnInWhen.kt") public void testDefiniteReturnInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.kt"); doTest(fileName); } @TestMetadata("kt1001.kt") public void testKt1001() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.kt"); doTest(fileName); } @TestMetadata("kt1027.kt") public void testKt1027() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt"); doTest(fileName); } @TestMetadata("kt1066.kt") public void testKt1066() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt"); doTest(fileName); } @TestMetadata("kt1156.kt") public void testKt1156() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.kt"); doTest(fileName); } @TestMetadata("kt1185enums.kt") public void testKt1185enums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt"); doTest(fileName); } @TestMetadata("kt1189.kt") public void testKt1189() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt"); doTest(fileName); } @TestMetadata("kt1191.kt") public void testKt1191() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.kt"); doTest(fileName); } @TestMetadata("kt1219.1301.kt") public void testKt1219_1301() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.kt"); doTest(fileName); } @TestMetadata("kt1571.kt") public void testKt1571() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.kt"); doTest(fileName); } @TestMetadata("kt1977.kt") public void testKt1977() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.kt"); doTest(fileName); } @TestMetadata("kt2166_kt2103.kt") public void testKt2166_kt2103() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.kt"); doTest(fileName); } @TestMetadata("kt2226.kt") public void testKt2226() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.kt"); doTest(fileName); } @TestMetadata("kt2330.kt") public void testKt2330() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.kt"); doTest(fileName); } @TestMetadata("kt2334.kt") public void testKt2334() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.kt"); doTest(fileName); } @TestMetadata("kt2369.kt") public void testKt2369() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt"); doTest(fileName); } @TestMetadata("kt2845.kt") public void testKt2845() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.kt"); doTest(fileName); } @TestMetadata("kt2960.kt") public void testKt2960() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt"); doTest(fileName); } @TestMetadata("kt2972.kt") public void testKt2972() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.kt"); doTest(fileName); } @TestMetadata("kt3444.kt") public void testKt3444() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.kt"); doTest(fileName); } @TestMetadata("kt3501.kt") public void testKt3501() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt"); doTest(fileName); } @TestMetadata("kt4126.kt") public void testKt4126() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4126.kt"); doTest(fileName); } @TestMetadata("kt4405.kt") public void testKt4405() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt"); doTest(fileName); } @TestMetadata("kt510.kt") public void testKt510() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.kt"); doTest(fileName); } @TestMetadata("kt607.kt") public void testKt607() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.kt"); doTest(fileName); } @TestMetadata("kt609.kt") public void testKt609() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.kt"); doTest(fileName); } @TestMetadata("kt610.kt") public void testKt610() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.kt"); doTest(fileName); } @TestMetadata("kt6788.kt") public void testKt6788() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt6788.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt6788.kt"); doTest(fileName); } @TestMetadata("kt776.kt") public void testKt776() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.kt"); doTest(fileName); } @TestMetadata("kt843.kt") public void testKt843() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt"); doTest(fileName); } @TestMetadata("kt897.kt") public void testKt897() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.kt"); doTest(fileName); } @TestMetadata("localClasses.kt") public void testLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt"); doTest(fileName); } @TestMetadata("propertiesInitWithOtherInstance.kt") public void testPropertiesInitWithOtherInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstance.kt"); doTest(fileName); } @TestMetadata("propertiesInitWithOtherInstanceInner.kt") public void testPropertiesInitWithOtherInstanceInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstanceInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstanceInner.kt"); doTest(fileName); } @TestMetadata("propertiesInitWithOtherInstanceThisLabel.kt") public void testPropertiesInitWithOtherInstanceThisLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstanceThisLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesInitWithOtherInstanceThisLabel.kt"); doTest(fileName); } @TestMetadata("propertiesOrderInPackage.kt") public void testPropertiesOrderInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.kt"); doTest(fileName); } @TestMetadata("referenceToPropertyInitializer.kt") public void testReferenceToPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("repeatUnitializedErrorOnlyForLocalVars.kt") public void testRepeatUnitializedErrorOnlyForLocalVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.kt"); doTest(fileName); } @TestMetadata("scopeOfAnonymousInitializer.kt") public void testScopeOfAnonymousInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt"); doTest(fileName); } @TestMetadata("uninitializedInLocalDeclarations.kt") public void testUninitializedInLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.kt"); doTest(fileName); } @TestMetadata("UninitializedOrReassignedVariables.kt") public void testUninitializedOrReassignedVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt"); doTest(fileName); } @TestMetadata("unmappedArgs.kt") public void testUnmappedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.kt"); doTest(fileName); } @TestMetadata("varInitializationInIfInCycle.kt") public void testVarInitializationInIfInCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DeadCode extends AbstractJetDiagnosticsTest { + public static class DeadCode extends AbstractDiagnosticsTest { public void testAllFilesPresentInDeadCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("commasAndWhitespaces.kt") public void testCommasAndWhitespaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.kt"); doTest(fileName); } @TestMetadata("commentsInDeadCode.kt") public void testCommentsInDeadCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.kt"); doTest(fileName); } @TestMetadata("deadCallInInvokeCall.kt") public void testDeadCallInInvokeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.kt"); doTest(fileName); } @TestMetadata("deadCallInReceiver.kt") public void testDeadCallInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.kt"); doTest(fileName); } @TestMetadata("deadCodeDifferentExamples.kt") public void testDeadCodeDifferentExamples() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.kt"); doTest(fileName); } @TestMetadata("deadCodeFromDifferentSources.kt") public void testDeadCodeFromDifferentSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.kt"); doTest(fileName); } @TestMetadata("deadCodeInArrayAccess.kt") public void testDeadCodeInArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.kt"); doTest(fileName); } @TestMetadata("deadCodeInAssignment.kt") public void testDeadCodeInAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.kt"); doTest(fileName); } @TestMetadata("deadCodeInBinaryExpressions.kt") public void testDeadCodeInBinaryExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.kt"); doTest(fileName); } @TestMetadata("deadCodeInCalls.kt") public void testDeadCodeInCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.kt"); doTest(fileName); } @TestMetadata("deadCodeInDeadCode.kt") public void testDeadCodeInDeadCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.kt"); doTest(fileName); } @TestMetadata("deadCodeInIf.kt") public void testDeadCodeInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.kt"); doTest(fileName); } @TestMetadata("deadCodeInInnerExpressions.kt") public void testDeadCodeInInnerExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.kt"); doTest(fileName); } @TestMetadata("deadCodeInLocalDeclarations.kt") public void testDeadCodeInLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.kt"); doTest(fileName); } @TestMetadata("deadCodeInLoops.kt") public void testDeadCodeInLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.kt"); doTest(fileName); } @TestMetadata("deadCodeInReturn.kt") public void testDeadCodeInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.kt"); doTest(fileName); } @TestMetadata("deadCodeInUnaryExpr.kt") public void testDeadCodeInUnaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.kt"); doTest(fileName); } @TestMetadata("deadCodeInWhileFromBreak.kt") public void testDeadCodeInWhileFromBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.kt"); doTest(fileName); } @TestMetadata("expressionInUnitLiteral.kt") public void testExpressionInUnitLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt"); doTest(fileName); } @TestMetadata("kt2585_1.kt") public void testKt2585_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.kt"); doTest(fileName); } @TestMetadata("kt2585_2.kt") public void testKt2585_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.kt"); doTest(fileName); } @TestMetadata("kt2585_3.kt") public void testKt2585_3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.kt"); doTest(fileName); } @TestMetadata("kt3162tryAsInitializer.kt") public void testKt3162tryAsInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.kt"); doTest(fileName); } @TestMetadata("kt5200DeadCodeInLambdas.kt") public void testKt5200DeadCodeInLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.kt"); doTest(fileName); } } @@ -3141,32 +3141,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefiniteReturn extends AbstractJetDiagnosticsTest { + public static class DefiniteReturn extends AbstractDiagnosticsTest { public void testAllFilesPresentInDefiniteReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt3444_ReturnFromLocalFunctions.kt") public void testKt3444_ReturnFromLocalFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt"); doTest(fileName); } @TestMetadata("kt4034.kt") public void testKt4034() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.kt"); doTest(fileName); } @TestMetadata("ReturnFromFunctionInObject.kt") public void testReturnFromFunctionInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.kt"); doTest(fileName); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/simpleClass.kt"); doTest(fileName); } } @@ -3175,128 +3175,128 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlStructures") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractJetDiagnosticsTest { + public static class ControlStructures extends AbstractDiagnosticsTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("commonSupertypeOfT.kt") public void testCommonSupertypeOfT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/commonSupertypeOfT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/commonSupertypeOfT.kt"); doTest(fileName); } @TestMetadata("emptyIf.kt") public void testEmptyIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/emptyIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/emptyIf.kt"); doTest(fileName); } @TestMetadata("forLoopWithNullableRange.kt") public void testForLoopWithNullableRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt"); doTest(fileName); } @TestMetadata("forWithNullableIterator.kt") public void testForWithNullableIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.kt"); doTest(fileName); } @TestMetadata("ForWithoutBraces.kt") public void testForWithoutBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.kt"); doTest(fileName); } @TestMetadata("ForbidStatementAsDirectFunctionBody.kt") public void testForbidStatementAsDirectFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.kt"); doTest(fileName); } @TestMetadata("improperElseInExpression.kt") public void testImproperElseInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt"); doTest(fileName); } @TestMetadata("jumpAcrossFunctionBoundary.kt") public void testJumpAcrossFunctionBoundary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.kt"); doTest(fileName); } @TestMetadata("kt1075.kt") public void testKt1075() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt1075.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt1075.kt"); doTest(fileName); } @TestMetadata("kt4310.kt") public void testKt4310() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt4310.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt4310.kt"); doTest(fileName); } @TestMetadata("kt657.kt") public void testKt657() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt657.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt657.kt"); doTest(fileName); } @TestMetadata("kt770.kt351.kt735_StatementType.kt") public void testKt770_kt351_kt735_StatementType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt"); doTest(fileName); } @TestMetadata("kt786.kt") public void testKt786() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt786.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt786.kt"); doTest(fileName); } @TestMetadata("kt799.kt") public void testKt799() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt799.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt799.kt"); doTest(fileName); } @TestMetadata("lambdasInExclExclAndElvis.kt") public void testLambdasInExclExclAndElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt"); doTest(fileName); } @TestMetadata("tryReturnType.kt") public void testTryReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt"); doTest(fileName); } @TestMetadata("typeInferenceForExclExcl.kt") public void testTypeInferenceForExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt"); doTest(fileName); } @TestMetadata("valVarCatchParameter.kt") public void testValVarCatchParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.kt"); doTest(fileName); } @TestMetadata("valVarLoopParameter.kt") public void testValVarLoopParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.kt"); doTest(fileName); } @TestMetadata("when.kt234.kt973.kt") public void testWhen_kt234_kt973() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt"); doTest(fileName); } } @@ -3304,68 +3304,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CyclicHierarchy extends AbstractJetDiagnosticsTest { + public static class CyclicHierarchy extends AbstractDiagnosticsTest { public void testAllFilesPresentInCyclicHierarchy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cyclicHierarchy"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cyclicHierarchy"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classIndirectlyInheritsNested.kt") public void testClassIndirectlyInheritsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.kt"); doTest(fileName); } @TestMetadata("classInheritsNested.kt") public void testClassInheritsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.kt"); doTest(fileName); } @TestMetadata("cyclicHierarchy.kt") public void testCyclicHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.kt"); doTest(fileName); } @TestMetadata("javaKotlinJavaCycle.kt") public void testJavaKotlinJavaCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.kt"); doTest(fileName); } @TestMetadata("kotlinJavaCycle.kt") public void testKotlinJavaCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.kt"); doTest(fileName); } @TestMetadata("kotlinJavaKotlinCycle.kt") public void testKotlinJavaKotlinCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.kt"); doTest(fileName); } @TestMetadata("kotlinJavaNestedCycle.kt") public void testKotlinJavaNestedCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.kt"); doTest(fileName); } @TestMetadata("kt303.kt") public void testKt303() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt"); doTest(fileName); } @TestMetadata("nestedClassInSuperClassParameter.kt") public void testNestedClassInSuperClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/nestedClassInSuperClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/nestedClassInSuperClassParameter.kt"); doTest(fileName); } @TestMetadata("twoClassesWithNestedCycle.kt") public void testTwoClassesWithNestedCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.kt"); doTest(fileName); } } @@ -3373,140 +3373,140 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DataClasses extends AbstractJetDiagnosticsTest { + public static class DataClasses extends AbstractDiagnosticsTest { public void testAllFilesPresentInDataClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("componentNamedComponent1.kt") public void testComponentNamedComponent1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.kt"); doTest(fileName); } @TestMetadata("conflictingCopyOverloads.kt") public void testConflictingCopyOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.kt"); doTest(fileName); } @TestMetadata("conflictingOverloads.kt") public void testConflictingOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt"); doTest(fileName); } @TestMetadata("copyOfPrivateClass.kt") public void testCopyOfPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/copyOfPrivateClass.kt"); doTest(fileName); } @TestMetadata("dataClassNoName.kt") public void testDataClassNoName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataClassNoName.kt"); doTest(fileName); } @TestMetadata("dataClassVarargParam.kt") public void testDataClassVarargParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataClassVarargParam.kt"); doTest(fileName); } @TestMetadata("dataInheritance.kt") public void testDataInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataInheritance.kt"); doTest(fileName); } @TestMetadata("emptyConstructor.kt") public void testEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.kt"); doTest(fileName); } @TestMetadata("implementTraitWhichHasComponent1.kt") public void testImplementTraitWhichHasComponent1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.kt"); doTest(fileName); } @TestMetadata("implementTraitWhichHasFinalComponent1.kt") public void testImplementTraitWhichHasFinalComponent1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.kt"); doTest(fileName); } @TestMetadata("innerDataClass.kt") public void testInnerDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/innerDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/innerDataClass.kt"); doTest(fileName); } @TestMetadata("innerOuterDataClass.kt") public void testInnerOuterDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/innerOuterDataClass.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("multiDeclarationFor.kt") public void testMultiDeclarationFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.kt"); doTest(fileName); } @TestMetadata("noConstructor.kt") public void testNoConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/noConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/noConstructor.kt"); doTest(fileName); } @TestMetadata("notADataClass.kt") public void testNotADataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/notADataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/notADataClass.kt"); doTest(fileName); } @TestMetadata("oneValParam.kt") public void testOneValParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/oneValParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/oneValParam.kt"); doTest(fileName); } @TestMetadata("repeatedProperties.kt") public void testRepeatedProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/repeatedProperties.kt"); doTest(fileName); } @TestMetadata("sealedDataClass.kt") public void testSealedDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/sealedDataClass.kt"); doTest(fileName); } @TestMetadata("strange.kt") public void testStrange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/strange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/strange.kt"); doTest(fileName); } @TestMetadata("twoValParams.kt") public void testTwoValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoValParams.kt"); doTest(fileName); } @TestMetadata("twoVarParams.kt") public void testTwoVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoVarParams.kt"); doTest(fileName); } } @@ -3514,70 +3514,70 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlow") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DataFlow extends AbstractJetDiagnosticsTest { + public static class DataFlow extends AbstractDiagnosticsTest { public void testAllFilesPresentInDataFlow() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CalleeExpression.kt") public void testCalleeExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt"); doTest(fileName); } @TestMetadata("EmptyIf.kt") public void testEmptyIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/EmptyIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/EmptyIf.kt"); doTest(fileName); } @TestMetadata("IsExpression.kt") public void testIsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt"); doTest(fileName); } @TestMetadata("WhenSubject.kt") public void testWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/WhenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/WhenSubject.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Assignment extends AbstractJetDiagnosticsTest { + public static class Assignment extends AbstractDiagnosticsTest { public void testAllFilesPresentInAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/assignment"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/assignment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignToNewVal.kt") public void testAssignToNewVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/assignToNewVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/assignToNewVal.kt"); doTest(fileName); } @TestMetadata("kt6118.kt") public void testKt6118() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/kt6118.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/kt6118.kt"); doTest(fileName); } @TestMetadata("uninitializedValIsCheck.kt") public void testUninitializedValIsCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/uninitializedValIsCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/uninitializedValIsCheck.kt"); doTest(fileName); } @TestMetadata("uninitializedValNullability.kt") public void testUninitializedValNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/uninitializedValNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/uninitializedValNullability.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/assignment/when.kt"); doTest(fileName); } } @@ -3585,80 +3585,80 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlow/local") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Local extends AbstractJetDiagnosticsTest { + public static class Local extends AbstractDiagnosticsTest { public void testAllFilesPresentInLocal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/local"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/local"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2835.kt") public void testKt2835() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt"); doTest(fileName); } @TestMetadata("LocalClassBase.kt") public void testLocalClassBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.kt"); doTest(fileName); } @TestMetadata("LocalClassDefaultParameters.kt") public void testLocalClassDefaultParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.kt"); doTest(fileName); } @TestMetadata("LocalClassDelegatedProperties.kt") public void testLocalClassDelegatedProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.kt"); doTest(fileName); } @TestMetadata("LocalClassDelegation.kt") public void testLocalClassDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.kt"); doTest(fileName); } @TestMetadata("LocalClassFunctions.kt") public void testLocalClassFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.kt"); doTest(fileName); } @TestMetadata("LocalClassInMemberOfLocalClass.kt") public void testLocalClassInMemberOfLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.kt"); doTest(fileName); } @TestMetadata("LocalClassInitializer.kt") public void testLocalClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt"); doTest(fileName); } @TestMetadata("LocalClassProperty.kt") public void testLocalClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.kt"); doTest(fileName); } @TestMetadata("LocalObject.kt") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.kt"); doTest(fileName); } @TestMetadata("LocalObjectDelegation.kt") public void testLocalObjectDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.kt"); doTest(fileName); } @TestMetadata("NestedLocalClass.kt") public void testNestedLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.kt"); doTest(fileName); } } @@ -3667,340 +3667,340 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest { + public static class DataFlowInfoTraversal extends AbstractDiagnosticsTest { public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AndOr.kt") public void testAndOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.kt"); doTest(fileName); } @TestMetadata("ArrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt"); doTest(fileName); } @TestMetadata("ArrayExpression.kt") public void testArrayExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.kt"); doTest(fileName); } @TestMetadata("ArrayGetSetConvention.kt") public void testArrayGetSetConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.kt"); doTest(fileName); } @TestMetadata("ArrayIndices.kt") public void testArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.kt"); doTest(fileName); } @TestMetadata("Assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.kt"); doTest(fileName); } @TestMetadata("AssignmentInInitializer.kt") public void testAssignmentInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.kt"); doTest(fileName); } @TestMetadata("AssignmentOperation.kt") public void testAssignmentOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.kt"); doTest(fileName); } @TestMetadata("AssignmentToArrayElement.kt") public void testAssignmentToArrayElement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.kt"); doTest(fileName); } @TestMetadata("BinaryExpression.kt") public void testBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionBooleanOperations.kt") public void testBinaryExpressionBooleanOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionCompareToConvention.kt") public void testBinaryExpressionCompareToConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionContainsConvention.kt") public void testBinaryExpressionContainsConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionElvis.kt") public void testBinaryExpressionElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionEqualsConvention.kt") public void testBinaryExpressionEqualsConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionIdentifier.kt") public void testBinaryExpressionIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionPlusConvention.kt") public void testBinaryExpressionPlusConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.kt"); doTest(fileName); } @TestMetadata("Condition.kt") public void testCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.kt"); doTest(fileName); } @TestMetadata("ContinueOuterLoop.kt") public void testContinueOuterLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.kt"); doTest(fileName); } @TestMetadata("DeepIf.kt") public void testDeepIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt"); doTest(fileName); } @TestMetadata("DoWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt"); doTest(fileName); } @TestMetadata("DoWhileCondition.kt") public void testDoWhileCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.kt"); doTest(fileName); } @TestMetadata("Elvis.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.kt"); doTest(fileName); } @TestMetadata("ExclExcl.kt") public void testExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.kt"); doTest(fileName); } @TestMetadata("For.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt"); doTest(fileName); } @TestMetadata("ForLoopRange.kt") public void testForLoopRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.kt"); doTest(fileName); } @TestMetadata("FunctionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.kt"); doTest(fileName); } @TestMetadata("IfStatement.kt") public void testIfStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.kt"); doTest(fileName); } @TestMetadata("IfThenElse.kt") public void testIfThenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt"); doTest(fileName); } @TestMetadata("IfThenElseBothInvalid.kt") public void testIfThenElseBothInvalid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt"); doTest(fileName); } @TestMetadata("IsExpression.kt") public void testIsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.kt"); doTest(fileName); } @TestMetadata("kt4332WhenBranches.kt") public void testKt4332WhenBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.kt"); doTest(fileName); } @TestMetadata("kt5155WhenBranches.kt") public void testKt5155WhenBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.kt"); doTest(fileName); } @TestMetadata("kt5182WhenBranches.kt") public void testKt5182WhenBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.kt"); doTest(fileName); } @TestMetadata("ManyIfs.kt") public void testManyIfs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.kt"); doTest(fileName); } @TestMetadata("MultiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.kt"); doTest(fileName); } @TestMetadata("ObjectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt"); doTest(fileName); } @TestMetadata("QualifiedExpression.kt") public void testQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.kt"); doTest(fileName); } @TestMetadata("Return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt"); doTest(fileName); } @TestMetadata("StringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.kt"); doTest(fileName); } @TestMetadata("ThisSuper.kt") public void testThisSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt"); doTest(fileName); } @TestMetadata("Throw.kt") public void testThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt"); doTest(fileName); } @TestMetadata("TryCatch.kt") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.kt"); doTest(fileName); } @TestMetadata("TryFinally.kt") public void testTryFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.kt"); doTest(fileName); } @TestMetadata("UnaryExpression.kt") public void testUnaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.kt"); doTest(fileName); } @TestMetadata("When.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.kt"); doTest(fileName); } @TestMetadata("WhenEntryAs.kt") public void testWhenEntryAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.kt"); doTest(fileName); } @TestMetadata("WhenEntryIs.kt") public void testWhenEntryIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.kt"); doTest(fileName); } @TestMetadata("WhenIn.kt") public void testWhenIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.kt"); doTest(fileName); } @TestMetadata("WhenSubject.kt") public void testWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.kt"); doTest(fileName); } @TestMetadata("While.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt"); doTest(fileName); } @TestMetadata("WhileCondition.kt") public void testWhileCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Smartcasts extends AbstractJetDiagnosticsTest { + public static class Smartcasts extends AbstractDiagnosticsTest { public void testAllFilesPresentInSmartcasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("SmartcastAmbiguitites.kt") public void testSmartcastAmbiguitites() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.kt"); doTest(fileName); } @TestMetadata("SmartcastsForStableIdentifiers.kt") public void testSmartcastsForStableIdentifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.kt"); doTest(fileName); } } @@ -4009,184 +4009,184 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DeclarationChecks extends AbstractJetDiagnosticsTest { + public static class DeclarationChecks extends AbstractDiagnosticsTest { public void testAllFilesPresentInDeclarationChecks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguousObjectExpressionType.kt") public void testAmbiguousObjectExpressionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt"); doTest(fileName); } @TestMetadata("ComponentFunctionReturnTypeMismatch.kt") public void testComponentFunctionReturnTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt"); doTest(fileName); } @TestMetadata("ConflictingAndRedundantProjections.kt") public void testConflictingAndRedundantProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.kt"); doTest(fileName); } @TestMetadata("DataFlowInMultiDeclInFor.kt") public void testDataFlowInMultiDeclInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt"); doTest(fileName); } @TestMetadata("DataFlowInfoInMultiDecl.kt") public void testDataFlowInfoInMultiDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.kt"); doTest(fileName); } @TestMetadata("FunctionWithMissingNames.kt") public void testFunctionWithMissingNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/FunctionWithMissingNames.kt"); doTest(fileName); } @TestMetadata("illegalModifiersOnClass.kt") public void testIllegalModifiersOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt"); doTest(fileName); } @TestMetadata("kt1141.kt") public void testKt1141() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1141.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1141.kt"); doTest(fileName); } @TestMetadata("kt1193.kt") public void testKt1193() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt"); doTest(fileName); } @TestMetadata("kt2096.kt") public void testKt2096() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2096.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2096.kt"); doTest(fileName); } @TestMetadata("kt2142.kt") public void testKt2142() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2142.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2142.kt"); doTest(fileName); } @TestMetadata("kt2397.kt") public void testKt2397() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt"); doTest(fileName); } @TestMetadata("kt2631_MultipleDeclaration.kt") public void testKt2631_MultipleDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt"); doTest(fileName); } @TestMetadata("kt2643MultiDeclInControlFlow.kt") public void testKt2643MultiDeclInControlFlow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt"); doTest(fileName); } @TestMetadata("kt559.kt") public void testKt559() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt559.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt559.kt"); doTest(fileName); } @TestMetadata("localDeclarationModifiers.kt") public void testLocalDeclarationModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.kt"); doTest(fileName); } @TestMetadata("localFunctionNoInheritVisibility.kt") public void testLocalFunctionNoInheritVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.kt"); doTest(fileName); } @TestMetadata("LocalVariableWithNoTypeInformation.kt") public void testLocalVariableWithNoTypeInformation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.kt"); doTest(fileName); } @TestMetadata("MultiDeclarationErrors.kt") public void testMultiDeclarationErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt"); doTest(fileName); } @TestMetadata("packageDeclarationModifiers.kt") public void testPackageDeclarationModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.kt"); doTest(fileName); } @TestMetadata("propertyInPackageHasNoInheritVisibility.kt") public void testPropertyInPackageHasNoInheritVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt"); doTest(fileName); } @TestMetadata("RedeclarationsInMultiDecl.kt") public void testRedeclarationsInMultiDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt"); doTest(fileName); } @TestMetadata("unambiguousObjectExpressionType.kt") public void testUnambiguousObjectExpressionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.kt"); doTest(fileName); } @TestMetadata("valVarFunctionParameter.kt") public void testValVarFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.kt"); doTest(fileName); } @TestMetadata("VarianceOnFunctionAndPropertyTypeParameters.kt") public void testVarianceOnFunctionAndPropertyTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FiniteBoundRestriction extends AbstractJetDiagnosticsTest { + public static class FiniteBoundRestriction extends AbstractDiagnosticsTest { public void testAllFilesPresentInFiniteBoundRestriction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CasesWithOneTypeParameter.kt") public void testCasesWithOneTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.kt"); doTest(fileName); } @TestMetadata("CasesWithTwoTypeParameters.kt") public void testCasesWithTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithTwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("JavaSuperType.kt") public void testJavaSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/JavaSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/JavaSuperType.kt"); doTest(fileName); } } @@ -4194,62 +4194,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultiDeclarations extends AbstractJetDiagnosticsTest { + public static class MultiDeclarations extends AbstractDiagnosticsTest { public void testAllFilesPresentInMultiDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoubleDeclForLoop.kt") public void testDoubleDeclForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt"); doTest(fileName); } @TestMetadata("FolLoopTypeComponentTypeMismatch.kt") public void testFolLoopTypeComponentTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt"); doTest(fileName); } @TestMetadata("ForLoopComponentFunctionAmbiguity.kt") public void testForLoopComponentFunctionAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt"); doTest(fileName); } @TestMetadata("ForLoopComponentFunctionMissing.kt") public void testForLoopComponentFunctionMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt"); doTest(fileName); } @TestMetadata("ForLoopWithExtensions.kt") public void testForLoopWithExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt"); doTest(fileName); } @TestMetadata("ForWithExplicitTypes.kt") public void testForWithExplicitTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt"); doTest(fileName); } @TestMetadata("kt2829.kt") public void testKt2829() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt"); doTest(fileName); } @TestMetadata("RedeclarationInForLoop.kt") public void testRedeclarationInForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt"); doTest(fileName); } @TestMetadata("SingleDeclForLoop.kt") public void testSingleDeclForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt"); doTest(fileName); } } @@ -4257,26 +4257,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NonExpansiveInheritanceRestriction extends AbstractJetDiagnosticsTest { + public static class NonExpansiveInheritanceRestriction extends AbstractDiagnosticsTest { public void testAllFilesPresentInNonExpansiveInheritanceRestriction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("JavaWithKotlin.kt") public void testJavaWithKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt"); doTest(fileName); } @TestMetadata("JavaWithKotlin2.kt") public void testJavaWithKotlin2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt"); doTest(fileName); } @TestMetadata("PureKotlin.kt") public void testPureKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/PureKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/PureKotlin.kt"); doTest(fileName); } } @@ -4285,14 +4285,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/defaultArguments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultArguments extends AbstractJetDiagnosticsTest { + public static class DefaultArguments extends AbstractDiagnosticsTest { public void testAllFilesPresentInDefaultArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt5232.kt") public void testKt5232() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/defaultArguments/kt5232.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/defaultArguments/kt5232.kt"); doTest(fileName); } } @@ -4300,322 +4300,322 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DelegatedProperty extends AbstractJetDiagnosticsTest { + public static class DelegatedProperty extends AbstractDiagnosticsTest { @TestMetadata("absentErrorAboutInitializer.kt") public void testAbsentErrorAboutInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt"); doTest(fileName); } @TestMetadata("absentErrorAboutType.kt") public void testAbsentErrorAboutType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.kt"); doTest(fileName); } @TestMetadata("abstractDelegatedProperty.kt") public void testAbstractDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.kt"); doTest(fileName); } public void testAllFilesPresentInDelegatedProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("backingField.kt") public void testBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt"); doTest(fileName); } @TestMetadata("defaultGetter.kt") public void testDefaultGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/defaultGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/defaultGetter.kt"); doTest(fileName); } @TestMetadata("defaultSetter.kt") public void testDefaultSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/defaultSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/defaultSetter.kt"); doTest(fileName); } @TestMetadata("delegatedPropertyOverridedInTrait.kt") public void testDelegatedPropertyOverridedInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.kt"); doTest(fileName); } @TestMetadata("delegatedPropertyOverridedInTraitTypeMismatch.kt") public void testDelegatedPropertyOverridedInTraitTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.kt"); doTest(fileName); } @TestMetadata("disallowImplInTypeParameter.kt") public void testDisallowImplInTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/disallowImplInTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/disallowImplInTypeParameter.kt"); doTest(fileName); } @TestMetadata("genericGetter.kt") public void testGenericGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.kt"); doTest(fileName); } @TestMetadata("getterWithSubtype.kt") public void testGetterWithSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.kt"); doTest(fileName); } @TestMetadata("inTrait.kt") public void testInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inTrait.kt"); doTest(fileName); } @TestMetadata("incompleteTypeInference.kt") public void testIncompleteTypeInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt"); doTest(fileName); } @TestMetadata("kt4640.kt") public void testKt4640() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/kt4640.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/kt4640.kt"); doTest(fileName); } @TestMetadata("localVariable.kt") public void testLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/localVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/localVariable.kt"); doTest(fileName); } @TestMetadata("missedGetter.kt") public void testMissedGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt"); doTest(fileName); } @TestMetadata("missedSetter.kt") public void testMissedSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt"); doTest(fileName); } @TestMetadata("propertyDefferedType.kt") public void testPropertyDefferedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedAmbiguity.kt") public void testPropertyDelegatedAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedIncomplete.kt") public void testPropertyDelegatedIncomplete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedMissing.kt") public void testPropertyDelegatedMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedPrivate.kt") public void testPropertyDelegatedPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedWrongArguments.kt") public void testPropertyDelegatedWrongArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.kt"); doTest(fileName); } @TestMetadata("recursiveType.kt") public void testRecursiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt"); doTest(fileName); } @TestMetadata("redundantGetter.kt") public void testRedundantGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.kt"); doTest(fileName); } @TestMetadata("redundantSetter.kt") public void testRedundantSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.kt"); doTest(fileName); } @TestMetadata("setterThisTypeMismatch.kt") public void testSetterThisTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt"); doTest(fileName); } @TestMetadata("setterWithSupertype.kt") public void testSetterWithSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.kt"); doTest(fileName); } @TestMetadata("thisInDelegate.kt") public void testThisInDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.kt"); doTest(fileName); } @TestMetadata("thisOfAnyType.kt") public void testThisOfAnyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.kt"); doTest(fileName); } @TestMetadata("thisOfNothingNullableType.kt") public void testThisOfNothingNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt"); doTest(fileName); } @TestMetadata("thisOfNothingType.kt") public void testThisOfNothingType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt"); doTest(fileName); } @TestMetadata("twoGetMethods.kt") public void testTwoGetMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.kt"); doTest(fileName); } @TestMetadata("typeMismatchForGetReturnType.kt") public void testTypeMismatchForGetReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt"); doTest(fileName); } @TestMetadata("typeMismatchForGetWithGeneric.kt") public void testTypeMismatchForGetWithGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt"); doTest(fileName); } @TestMetadata("typeMismatchForSetParameter.kt") public void testTypeMismatchForSetParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt"); doTest(fileName); } @TestMetadata("typeMismatchForThisGetParameter.kt") public void testTypeMismatchForThisGetParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt"); doTest(fileName); } @TestMetadata("wrongCountOfParametersInGet.kt") public void testWrongCountOfParametersInGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.kt"); doTest(fileName); } @TestMetadata("wrongCountOfParametersInSet.kt") public void testWrongCountOfParametersInSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.kt"); doTest(fileName); } @TestMetadata("wrongSetterReturnType.kt") public void testWrongSetterReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractJetDiagnosticsTest { + public static class Inference extends AbstractDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentDelegatedExpressions.kt") public void testDifferentDelegatedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt"); doTest(fileName); } @TestMetadata("extensionGet.kt") public void testExtensionGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.kt"); doTest(fileName); } @TestMetadata("extensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt"); doTest(fileName); } @TestMetadata("genericMethodInGenericClass.kt") public void testGenericMethodInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt"); doTest(fileName); } @TestMetadata("genericMethods.kt") public void testGenericMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt"); doTest(fileName); } @TestMetadata("labeledDelegatedExpression.kt") public void testLabeledDelegatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.kt"); doTest(fileName); } @TestMetadata("noErrorsForImplicitConstraints.kt") public void testNoErrorsForImplicitConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt"); doTest(fileName); } @TestMetadata("noExpectedTypeForSupertypeConstraint.kt") public void testNoExpectedTypeForSupertypeConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt"); doTest(fileName); } @TestMetadata("useCompleterWithoutExpectedType.kt") public void testUseCompleterWithoutExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.kt"); doTest(fileName); } @TestMetadata("useExpectedType.kt") public void testUseExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.kt"); doTest(fileName); } @TestMetadata("useExpectedTypeForVal.kt") public void testUseExpectedTypeForVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.kt"); doTest(fileName); } } @@ -4624,56 +4624,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/delegation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Delegation extends AbstractJetDiagnosticsTest { + public static class Delegation extends AbstractDiagnosticsTest { public void testAllFilesPresentInDelegation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegationAndOverriding.kt") public void testDelegationAndOverriding() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.kt"); doTest(fileName); } @TestMetadata("DelegationExpectedType.kt") public void testDelegationExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt"); doTest(fileName); } @TestMetadata("DelegationNotTotrait.kt") public void testDelegationNotTotrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.kt"); doTest(fileName); } @TestMetadata("DelegationToJavaIface.kt") public void testDelegationToJavaIface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.kt"); doTest(fileName); } @TestMetadata("Delegation_ClashingFunctions.kt") public void testDelegation_ClashingFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.kt"); doTest(fileName); } @TestMetadata("Delegation_Hierarchy.kt") public void testDelegation_Hierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.kt"); doTest(fileName); } @TestMetadata("Delegation_MultipleDelegates.kt") public void testDelegation_MultipleDelegates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.kt"); doTest(fileName); } @TestMetadata("Delegation_ScopeInitializationOrder.kt") public void testDelegation_ScopeInitializationOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.kt"); doTest(fileName); } } @@ -4681,44 +4681,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/deparenthesize") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Deparenthesize extends AbstractJetDiagnosticsTest { + public static class Deparenthesize extends AbstractDiagnosticsTest { public void testAllFilesPresentInDeparenthesize() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotatedSafeCall.kt") public void testAnnotatedSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/annotatedSafeCall.kt"); doTest(fileName); } @TestMetadata("checkDeparenthesizedType.kt") public void testCheckDeparenthesizedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt"); doTest(fileName); } @TestMetadata("labeledSafeCall.kt") public void testLabeledSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/labeledSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/labeledSafeCall.kt"); doTest(fileName); } @TestMetadata("multiParenthesizedSafeCall.kt") public void testMultiParenthesizedSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/multiParenthesizedSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/multiParenthesizedSafeCall.kt"); doTest(fileName); } @TestMetadata("parenthesizedSafeCall.kt") public void testParenthesizedSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/parenthesizedSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/parenthesizedSafeCall.kt"); doTest(fileName); } @TestMetadata("ParenthesizedVariable.kt") public void testParenthesizedVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/ParenthesizedVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/ParenthesizedVariable.kt"); doTest(fileName); } } @@ -4726,98 +4726,98 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/deprecated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Deprecated extends AbstractJetDiagnosticsTest { + public static class Deprecated extends AbstractDiagnosticsTest { public void testAllFilesPresentInDeprecated() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deprecated"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deprecated"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationUsage.kt") public void testAnnotationUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/annotationUsage.kt"); doTest(fileName); } @TestMetadata("componentUsage.kt") public void testComponentUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/componentUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/componentUsage.kt"); doTest(fileName); } @TestMetadata("deprecatedError.kt") public void testDeprecatedError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/deprecatedError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/deprecatedError.kt"); doTest(fileName); } @TestMetadata("deprecatedErrorBuilder.kt") public void testDeprecatedErrorBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/deprecatedErrorBuilder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/deprecatedErrorBuilder.kt"); doTest(fileName); } @TestMetadata("functionUsage.kt") public void testFunctionUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/functionUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/functionUsage.kt"); doTest(fileName); } @TestMetadata("genericConstructorUsage.kt") public void testGenericConstructorUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/genericConstructorUsage.kt"); doTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/imports.kt"); doTest(fileName); } @TestMetadata("iteratorUsage.kt") public void testIteratorUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/iteratorUsage.kt"); doTest(fileName); } @TestMetadata("javaDeprecated.kt") public void testJavaDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/javaDeprecated.kt"); doTest(fileName); } @TestMetadata("javaDocDeprecated.kt") public void testJavaDocDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/javaDocDeprecated.kt"); doTest(fileName); } @TestMetadata("nestedTypesUsage.kt") public void testNestedTypesUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/nestedTypesUsage.kt"); doTest(fileName); } @TestMetadata("objectUsage.kt") public void testObjectUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/objectUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/objectUsage.kt"); doTest(fileName); } @TestMetadata("propertyUsage.kt") public void testPropertyUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/propertyUsage.kt"); doTest(fileName); } @TestMetadata("propertyUseSiteTargetedAnnotations.kt") public void testPropertyUseSiteTargetedAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/propertyUseSiteTargetedAnnotations.kt"); doTest(fileName); } @TestMetadata("typeUsage.kt") public void testTypeUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/typeUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deprecated/typeUsage.kt"); doTest(fileName); } } @@ -4825,118 +4825,118 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest { + public static class DuplicateJvmSignature extends AbstractDiagnosticsTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("caseInProperties.kt") public void testCaseInProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt"); doTest(fileName); } @TestMetadata("missingNames.kt") public void testMissingNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AccidentalOverrides extends AbstractJetDiagnosticsTest { + public static class AccidentalOverrides extends AbstractDiagnosticsTest { public void testAllFilesPresentInAccidentalOverrides() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classFunctionOverriddenByProperty.kt") public void testClassFunctionOverriddenByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt"); doTest(fileName); } @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt") public void testClassFunctionOverriddenByPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt") public void testClassFunctionOverriddenByPropertyNoGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt"); doTest(fileName); } @TestMetadata("classPropertyOverriddenByFunction.kt") public void testClassPropertyOverriddenByFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt"); doTest(fileName); } @TestMetadata("defaultFunction.kt") public void testDefaultFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.kt"); doTest(fileName); } @TestMetadata("delegatedFunctionOverriddenByProperty.kt") public void testDelegatedFunctionOverriddenByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt"); doTest(fileName); } @TestMetadata("genericClassFunction.kt") public void testGenericClassFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt"); doTest(fileName); } @TestMetadata("overridesNothing.kt") public void testOverridesNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt"); doTest(fileName); } @TestMetadata("privateClassFunctionOverriddenByProperty.kt") public void testPrivateClassFunctionOverriddenByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt"); doTest(fileName); } @TestMetadata("require.kt") public void testRequire() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt"); doTest(fileName); } @TestMetadata("traitFunctionOverriddenByProperty.kt") public void testTraitFunctionOverriddenByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt"); doTest(fileName); } @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt") public void testTraitFunctionOverriddenByPropertyNoImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt"); doTest(fileName); } @TestMetadata("traitPropertyOverriddenByFunction.kt") public void testTraitPropertyOverriddenByFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt"); doTest(fileName); } @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt") public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt"); doTest(fileName); } } @@ -4944,26 +4944,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Bridges extends AbstractJetDiagnosticsTest { + public static class Bridges extends AbstractDiagnosticsTest { public void testAllFilesPresentInBridges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt"); doTest(fileName); } @TestMetadata("fakeOverrideTrait.kt") public void testFakeOverrideTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt"); doTest(fileName); } } @@ -4971,104 +4971,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Erasure extends AbstractJetDiagnosticsTest { + public static class Erasure extends AbstractDiagnosticsTest { public void testAllFilesPresentInErasure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("collections.kt") public void testCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt"); doTest(fileName); } @TestMetadata("delegateToTwoTraits.kt") public void testDelegateToTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt"); doTest(fileName); } @TestMetadata("delegationAndOwnMethod.kt") public void testDelegationAndOwnMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt"); doTest(fileName); } @TestMetadata("delegationToTraitImplAndOwnMethod.kt") public void testDelegationToTraitImplAndOwnMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.kt"); doTest(fileName); } @TestMetadata("extensionProperties.kt") public void testExtensionProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt"); doTest(fileName); } @TestMetadata("genericType.kt") public void testGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt"); doTest(fileName); } @TestMetadata("inheritFromTwoTraits.kt") public void testInheritFromTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt"); doTest(fileName); } @TestMetadata("kotlinAndJavaCollections.kt") public void testKotlinAndJavaCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt"); doTest(fileName); } @TestMetadata("nullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt"); doTest(fileName); } @TestMetadata("superTraitAndDelegationToTraitImpl.kt") public void testSuperTraitAndDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("twoTraitsAndOwnFunction.kt") public void testTwoTraitsAndOwnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt"); doTest(fileName); } @TestMetadata("typeMappedToJava.kt") public void testTypeMappedToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt"); doTest(fileName); } @TestMetadata("typeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt"); doTest(fileName); } @TestMetadata("typeParameterWithBound.kt") public void testTypeParameterWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt"); doTest(fileName); } @TestMetadata("typeParameterWithTwoBounds.kt") public void testTypeParameterWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt"); doTest(fileName); } @TestMetadata("typeParameterWithTwoBoundsInWhere.kt") public void testTypeParameterWithTwoBoundsInWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt"); doTest(fileName); } } @@ -5076,122 +5076,122 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionAndProperty extends AbstractJetDiagnosticsTest { + public static class FunctionAndProperty extends AbstractDiagnosticsTest { public void testAllFilesPresentInFunctionAndProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt"); doTest(fileName); } @TestMetadata("classPropertyInConstructor.kt") public void testClassPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("extensionFunctionAndNormalFunction.kt") public void testExtensionFunctionAndNormalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt"); doTest(fileName); } @TestMetadata("extensionPropertyAndFunction.kt") public void testExtensionPropertyAndFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt"); doTest(fileName); } @TestMetadata("functionAndSetter.kt") public void testFunctionAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt"); doTest(fileName); } @TestMetadata("functionAndVar.kt") public void testFunctionAndVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt"); doTest(fileName); } @TestMetadata("localClassInClass.kt") public void testLocalClassInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt"); doTest(fileName); } @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt"); doTest(fileName); } @TestMetadata("objectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); doTest(fileName); } @TestMetadata("objectExpressionInConstructor.kt") public void testObjectExpressionInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt"); doTest(fileName); } @TestMetadata("privateClassPropertyNoClash.kt") public void testPrivateClassPropertyNoClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt"); doTest(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt"); doTest(fileName); } @TestMetadata("topLevelDifferentFiles.kt") public void testTopLevelDifferentFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt"); doTest(fileName); } @TestMetadata("topLevelGetter.kt") public void testTopLevelGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt"); doTest(fileName); } @TestMetadata("withErrorTypes.kt") public void testWithErrorTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt"); doTest(fileName); } } @@ -5199,68 +5199,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SpecialNames extends AbstractJetDiagnosticsTest { + public static class SpecialNames extends AbstractDiagnosticsTest { public void testAllFilesPresentInSpecialNames() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt"); doTest(fileName); } @TestMetadata("classObjectCopiedField.kt") public void testClassObjectCopiedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt"); doTest(fileName); } @TestMetadata("classObjectCopiedFieldObject.kt") public void testClassObjectCopiedFieldObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt"); doTest(fileName); } @TestMetadata("dataClassCopy.kt") public void testDataClassCopy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt"); doTest(fileName); } @TestMetadata("defaults.kt") public void testDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt"); doTest(fileName); } @TestMetadata("delegationBy.kt") public void testDelegationBy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt"); doTest(fileName); } @TestMetadata("innerClassField.kt") public void testInnerClassField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt"); doTest(fileName); } @TestMetadata("instance.kt") public void testInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt"); doTest(fileName); } @TestMetadata("propertyMetadataCache.kt") public void testPropertyMetadataCache() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt"); doTest(fileName); } } @@ -5268,32 +5268,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractJetDiagnosticsTest { + public static class Statics extends AbstractDiagnosticsTest { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jjk.kt") public void testJjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jjk.kt"); doTest(fileName); } @TestMetadata("jk.kt") public void testJk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jk.kt"); doTest(fileName); } @TestMetadata("jkjk.kt") public void testJkjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/jkjk.kt"); doTest(fileName); } @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); doTest(fileName); } } @@ -5301,14 +5301,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Synthesized extends AbstractJetDiagnosticsTest { + public static class Synthesized extends AbstractDiagnosticsTest { public void testAllFilesPresentInSynthesized() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumValuesValueOf.kt") public void testEnumValuesValueOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.kt"); doTest(fileName); } } @@ -5316,32 +5316,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TraitImpl extends AbstractJetDiagnosticsTest { + public static class TraitImpl extends AbstractDiagnosticsTest { public void testAllFilesPresentInTraitImpl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("oneTrait.kt") public void testOneTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt"); doTest(fileName); } @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt") public void testTraitFunctionOverriddenByPropertyInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait.kt"); doTest(fileName); } @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt") public void testTraitPropertyOverriddenByFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait.kt"); doTest(fileName); } @TestMetadata("twoTraits.kt") public void testTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt"); doTest(fileName); } } @@ -5350,26 +5350,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dynamicTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DynamicTypes extends AbstractJetDiagnosticsTest { + public static class DynamicTypes extends AbstractDiagnosticsTest { public void testAllFilesPresentInDynamicTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegationBy.kt") public void testDelegationBy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/delegationBy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/delegationBy.kt"); doTest(fileName); } @TestMetadata("unsupported.kt") public void testUnsupported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/unsupported.kt"); doTest(fileName); } @TestMetadata("withInvisibleSynthesized.kt") public void testWithInvisibleSynthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt"); doTest(fileName); } } @@ -5377,370 +5377,370 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Enum extends AbstractJetDiagnosticsTest { + public static class Enum extends AbstractDiagnosticsTest { @TestMetadata("AbstractEnum.kt") public void testAbstractEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt"); doTest(fileName); } @TestMetadata("AbstractInEnum.kt") public void testAbstractInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt"); doTest(fileName); } @TestMetadata("AbstractOverrideInEnum.kt") public void testAbstractOverrideInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.kt"); doTest(fileName); } public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectInEnum.kt") public void testClassObjectInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectInEnum.kt"); doTest(fileName); } @TestMetadata("classObjectInEnumPrivate.kt") public void testClassObjectInEnumPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.kt"); doTest(fileName); } @TestMetadata("commonSupertype.kt") public void testCommonSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/commonSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/commonSupertype.kt"); doTest(fileName); } @TestMetadata("ConstructorCallFromOutside.kt") public void testConstructorCallFromOutside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ConstructorCallFromOutside.kt"); doTest(fileName); } @TestMetadata("dontCreatePackageTypeForEnumEntry.kt") public void testDontCreatePackageTypeForEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt"); doTest(fileName); } @TestMetadata("emptyConstructor.kt") public void testEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/emptyConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/emptyConstructor.kt"); doTest(fileName); } @TestMetadata("entryShouldBeOfEnumType.kt") public void testEntryShouldBeOfEnumType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt"); doTest(fileName); } @TestMetadata("enumEntryCannotHaveClassObject.kt") public void testEnumEntryCannotHaveClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt"); doTest(fileName); } @TestMetadata("enumEntryInAbstractEnum.kt") public void testEnumEntryInAbstractEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.kt"); doTest(fileName); } @TestMetadata("enumImplementingTrait.kt") public void testEnumImplementingTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumImplementingTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumImplementingTrait.kt"); doTest(fileName); } @TestMetadata("enumInheritance.kt") public void testEnumInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumInheritance.kt"); doTest(fileName); } @TestMetadata("enumIsAssignableToBuiltInEnum.kt") public void testEnumIsAssignableToBuiltInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt"); doTest(fileName); } @TestMetadata("enumMissingName.kt") public void testEnumMissingName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumMissingName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumMissingName.kt"); doTest(fileName); } @TestMetadata("enumModifier.kt") public void testEnumModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumModifier.kt"); doTest(fileName); } @TestMetadata("enumStarImport.kt") public void testEnumStarImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumStarImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumStarImport.kt"); doTest(fileName); } @TestMetadata("enumWithAnnotationKeyword.kt") public void testEnumWithAnnotationKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumWithAnnotationKeyword.kt"); doTest(fileName); } @TestMetadata("enumWithEmptyName.kt") public void testEnumWithEmptyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt"); doTest(fileName); } @TestMetadata("ExplicitConstructorCall.kt") public void testExplicitConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ExplicitConstructorCall.kt"); doTest(fileName); } @TestMetadata("extensionNamedAsEnumEntry.kt") public void testExtensionNamedAsEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.kt"); doTest(fileName); } @TestMetadata("ifEnumEntry.kt") public void testIfEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ifEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/ifEnumEntry.kt"); doTest(fileName); } @TestMetadata("importEnumFromJava.kt") public void testImportEnumFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt"); doTest(fileName); } @TestMetadata("inheritFromEnumEntry.kt") public void testInheritFromEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.kt"); doTest(fileName); } @TestMetadata("inheritanceFromEnum.kt") public void testInheritanceFromEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.kt"); doTest(fileName); } @TestMetadata("inline.kt") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inline.kt"); doTest(fileName); } @TestMetadata("InsideEntryConstructorCall.kt") public void testInsideEntryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/InsideEntryConstructorCall.kt"); doTest(fileName); } @TestMetadata("InsideSecondaryConstructorCall.kt") public void testInsideSecondaryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/InsideSecondaryConstructorCall.kt"); doTest(fileName); } @TestMetadata("interfaceWithEnumKeyword.kt") public void testInterfaceWithEnumKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/interfaceWithEnumKeyword.kt"); doTest(fileName); } @TestMetadata("isEnumEntry.kt") public void testIsEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/isEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/isEnumEntry.kt"); doTest(fileName); } @TestMetadata("javaEnumValueOfMethod.kt") public void testJavaEnumValueOfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.kt"); doTest(fileName); } @TestMetadata("javaEnumValuesMethod.kt") public void testJavaEnumValuesMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt"); doTest(fileName); } @TestMetadata("javaEnumWithAbstractFun.kt") public void testJavaEnumWithAbstractFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt"); doTest(fileName); } @TestMetadata("javaEnumWithFuns.kt") public void testJavaEnumWithFuns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.kt"); doTest(fileName); } @TestMetadata("javaEnumWithNameClashing.kt") public void testJavaEnumWithNameClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.kt"); doTest(fileName); } @TestMetadata("javaEnumWithProperty.kt") public void testJavaEnumWithProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.kt"); doTest(fileName); } @TestMetadata("kt2834.kt") public void testKt2834() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/kt2834.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/kt2834.kt"); doTest(fileName); } @TestMetadata("kt8972_cloneNotAllowed.kt") public void testKt8972_cloneNotAllowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt"); doTest(fileName); } @TestMetadata("localEnums.kt") public void testLocalEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/localEnums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/localEnums.kt"); doTest(fileName); } @TestMetadata("modifiersOnEnumEntry.kt") public void testModifiersOnEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.kt"); doTest(fileName); } @TestMetadata("multipleConstructors.kt") public void testMultipleConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/multipleConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/multipleConstructors.kt"); doTest(fileName); } @TestMetadata("openMemberInEnum.kt") public void testOpenMemberInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/openMemberInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/openMemberInEnum.kt"); doTest(fileName); } @TestMetadata("overrideFinalEnumMethods.kt") public void testOverrideFinalEnumMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.kt"); doTest(fileName); } @TestMetadata("SecondaryConstructorCall.kt") public void testSecondaryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/SecondaryConstructorCall.kt"); doTest(fileName); } @TestMetadata("starImportNestedClassAndEntries.kt") public void testStarImportNestedClassAndEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt"); doTest(fileName); } @TestMetadata("typeParametersInEnum.kt") public void testTypeParametersInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/typeParametersInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/typeParametersInEnum.kt"); doTest(fileName); } @TestMetadata("valuesValueOfAndEntriesAccessibility.kt") public void testValuesValueOfAndEntriesAccessibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inner extends AbstractJetDiagnosticsTest { + public static class Inner extends AbstractDiagnosticsTest { public void testAllFilesPresentInInner() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/inner"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/inner"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("existingClassObject.kt") public void testExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt"); doTest(fileName); } @TestMetadata("insideClass.kt") public void testInsideClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClass.kt"); doTest(fileName); } @TestMetadata("insideClassObject.kt") public void testInsideClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt"); doTest(fileName); } @TestMetadata("insideEnum.kt") public void testInsideEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnum.kt"); doTest(fileName); } @TestMetadata("insideEnumEntry.kt") public void testInsideEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt"); doTest(fileName); } @TestMetadata("insideInnerClassNotAllowed.kt") public void testInsideInnerClassNotAllowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt"); doTest(fileName); } @TestMetadata("insideObject.kt") public void testInsideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideObject.kt"); doTest(fileName); } @TestMetadata("insideTrait.kt") public void testInsideTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideTrait.kt"); doTest(fileName); } @TestMetadata("redeclarationInClassObject.kt") public void testRedeclarationInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt"); doTest(fileName); } @TestMetadata("twoEnums.kt") public void testTwoEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnums.kt"); doTest(fileName); } @TestMetadata("twoEnumsInClassObjectAndInnerClass.kt") public void testTwoEnumsInClassObjectAndInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt"); doTest(fileName); } } @@ -5749,122 +5749,122 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/evaluate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Evaluate extends AbstractJetDiagnosticsTest { + public static class Evaluate extends AbstractDiagnosticsTest { public void testAllFilesPresentInEvaluate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryMinusDepOnExpType.kt") public void testBinaryMinusDepOnExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt"); doTest(fileName); } @TestMetadata("binaryMinusIndepWoExpType.kt") public void testBinaryMinusIndepWoExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.kt"); doTest(fileName); } @TestMetadata("binaryMinusIndependentExpType.kt") public void testBinaryMinusIndependentExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.kt"); doTest(fileName); } @TestMetadata("divisionByZero.kt") public void testDivisionByZero() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt"); doTest(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/float.kt"); doTest(fileName); } @TestMetadata("intOverflow.kt") public void testIntOverflow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflow.kt"); doTest(fileName); } @TestMetadata("intOverflowWithJavaProperties.kt") public void testIntOverflowWithJavaProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.kt"); doTest(fileName); } @TestMetadata("integer.kt") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/integer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/integer.kt"); doTest(fileName); } @TestMetadata("longOverflow.kt") public void testLongOverflow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/longOverflow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/longOverflow.kt"); doTest(fileName); } @TestMetadata("numberBinaryOperations.kt") public void testNumberBinaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt"); doTest(fileName); } @TestMetadata("numberBinaryOperationsCall.kt") public void testNumberBinaryOperationsCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.kt"); doTest(fileName); } @TestMetadata("numberBinaryOperationsInfixCall.kt") public void testNumberBinaryOperationsInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt"); doTest(fileName); } @TestMetadata("otherOverflow.kt") public void testOtherOverflow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/otherOverflow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/otherOverflow.kt"); doTest(fileName); } @TestMetadata("parentesized.kt") public void testParentesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/parentesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/parentesized.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressions.kt") public void testQualifiedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.kt"); doTest(fileName); } @TestMetadata("unaryMinusDepOnExpType.kt") public void testUnaryMinusDepOnExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.kt"); doTest(fileName); } @TestMetadata("unaryMinusIndepWoExpType.kt") public void testUnaryMinusIndepWoExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt"); doTest(fileName); } @TestMetadata("unaryMinusIndependentExpType.kt") public void testUnaryMinusIndependentExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.kt"); doTest(fileName); } @TestMetadata("wrongLongSuffix.kt") public void testWrongLongSuffix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.kt"); doTest(fileName); } } @@ -5872,134 +5872,134 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/exposed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Exposed extends AbstractJetDiagnosticsTest { + public static class Exposed extends AbstractDiagnosticsTest { public void testAllFilesPresentInExposed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/exposed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/exposed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegate.kt") public void testDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/delegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/delegate.kt"); doTest(fileName); } @TestMetadata("functional.kt") public void testFunctional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/functional.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/functional.kt"); doTest(fileName); } @TestMetadata("implements.kt") public void testImplements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/implements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/implements.kt"); doTest(fileName); } @TestMetadata("internal.kt") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internal.kt"); doTest(fileName); } @TestMetadata("internalAndProtected.kt") public void testInternalAndProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internalAndProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internalAndProtected.kt"); doTest(fileName); } @TestMetadata("internalFromLocal.kt") public void testInternalFromLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internalFromLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/internalFromLocal.kt"); doTest(fileName); } @TestMetadata("local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/local.kt"); doTest(fileName); } @TestMetadata("localFromInternal.kt") public void testLocalFromInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localFromInternal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localFromInternal.kt"); doTest(fileName); } @TestMetadata("localFromPrivate.kt") public void testLocalFromPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localFromPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localFromPrivate.kt"); doTest(fileName); } @TestMetadata("localInFunReturnType.kt") public void testLocalInFunReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInFunReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInFunReturnType.kt"); doTest(fileName); } @TestMetadata("localInMemberType.kt") public void testLocalInMemberType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInMemberType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInMemberType.kt"); doTest(fileName); } @TestMetadata("localInPropertyType.kt") public void testLocalInPropertyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/localInPropertyType.kt"); doTest(fileName); } @TestMetadata("nested.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/nested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/nested.kt"); doTest(fileName); } @TestMetadata("packagePrivate.kt") public void testPackagePrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/packagePrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/packagePrivate.kt"); doTest(fileName); } @TestMetadata("privateFromLocal.kt") public void testPrivateFromLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/privateFromLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/privateFromLocal.kt"); doTest(fileName); } @TestMetadata("protected.kt") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protected.kt"); doTest(fileName); } @TestMetadata("protectedInProtected.kt") public void testProtectedInProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedInProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedInProtected.kt"); doTest(fileName); } @TestMetadata("protectedJava.kt") public void testProtectedJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedJava.kt"); doTest(fileName); } @TestMetadata("protectedSameWay.kt") public void testProtectedSameWay() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedSameWay.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/protectedSameWay.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/simple.kt"); doTest(fileName); } @TestMetadata("typeArgs.kt") public void testTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/typeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/exposed/typeArgs.kt"); doTest(fileName); } } @@ -6007,110 +6007,110 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/extensions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Extensions extends AbstractJetDiagnosticsTest { + public static class Extensions extends AbstractDiagnosticsTest { public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/extensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/extensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/classObject.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctions.kt") public void testExtensionFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt"); doTest(fileName); } @TestMetadata("extensionMemberInClassObject.kt") public void testExtensionMemberInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt"); doTest(fileName); } @TestMetadata("extensionPropertyVsParameter.kt") public void testExtensionPropertyVsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/extensionPropertyVsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/extensionPropertyVsParameter.kt"); doTest(fileName); } @TestMetadata("ExtensionsCalledOnSuper.kt") public void testExtensionsCalledOnSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.kt"); doTest(fileName); } @TestMetadata("GenericIterator.kt") public void testGenericIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator.kt"); doTest(fileName); } @TestMetadata("GenericIterator2.kt") public void testGenericIterator2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt"); doTest(fileName); } @TestMetadata("kt1875.kt") public void testKt1875() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt1875.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt1875.kt"); doTest(fileName); } @TestMetadata("kt2317.kt") public void testKt2317() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt2317.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt2317.kt"); doTest(fileName); } @TestMetadata("kt3470.kt") public void testKt3470() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3470.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3470.kt"); doTest(fileName); } @TestMetadata("kt3563.kt") public void testKt3563() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3563.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3563.kt"); doTest(fileName); } @TestMetadata("kt819ExtensionProperties.kt") public void testKt819ExtensionProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.kt"); doTest(fileName); } @TestMetadata("noClassObjectsInJava.kt") public void testNoClassObjectsInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/object.kt"); doTest(fileName); } @TestMetadata("throwOutCandidatesByReceiver.kt") public void testThrowOutCandidatesByReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt"); doTest(fileName); } @TestMetadata("throwOutCandidatesByReceiver2.kt") public void testThrowOutCandidatesByReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt"); doTest(fileName); } @TestMetadata("variableInvoke.kt") public void testVariableInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/variableInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/variableInvoke.kt"); doTest(fileName); } } @@ -6118,104 +6118,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/functionAsExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionAsExpression extends AbstractJetDiagnosticsTest { + public static class FunctionAsExpression extends AbstractDiagnosticsTest { public void testAllFilesPresentInFunctionAsExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionAsExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionAsExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoLabels.kt") public void testAutoLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.kt"); doTest(fileName); } @TestMetadata("Common.kt") public void testCommon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/Common.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/Common.kt"); doTest(fileName); } @TestMetadata("DifficultInferenceForParameter.kt") public void testDifficultInferenceForParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/DifficultInferenceForParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/DifficultInferenceForParameter.kt"); doTest(fileName); } @TestMetadata("ForbiddenNonLocalReturn.kt") public void testForbiddenNonLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ForbiddenNonLocalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ForbiddenNonLocalReturn.kt"); doTest(fileName); } @TestMetadata("FunctionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt"); doTest(fileName); } @TestMetadata("InferenceParametersTypes.kt") public void testInferenceParametersTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt"); doTest(fileName); } @TestMetadata("MissingParameterTypes.kt") public void testMissingParameterTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt"); doTest(fileName); } @TestMetadata("NameDeprecation.kt") public void testNameDeprecation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/NameDeprecation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/NameDeprecation.kt"); doTest(fileName); } @TestMetadata("NoOverloadError.kt") public void testNoOverloadError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/NoOverloadError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/NoOverloadError.kt"); doTest(fileName); } @TestMetadata("Parameters.kt") public void testParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/Parameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/Parameters.kt"); doTest(fileName); } @TestMetadata("ReturnAndLabels.kt") public void testReturnAndLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ReturnAndLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ReturnAndLabels.kt"); doTest(fileName); } @TestMetadata("ReturnTypeCheck.kt") public void testReturnTypeCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ReturnTypeCheck.kt"); doTest(fileName); } @TestMetadata("ScopeCheck.kt") public void testScopeCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ScopeCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/ScopeCheck.kt"); doTest(fileName); } @TestMetadata("WithGenericParameters.kt") public void testWithGenericParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt"); doTest(fileName); } @TestMetadata("WithOuterGeneric.kt") public void testWithOuterGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithOuterGeneric.kt"); doTest(fileName); } @TestMetadata("WithoutBody.kt") public void testWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionAsExpression/WithoutBody.kt"); doTest(fileName); } } @@ -6223,292 +6223,292 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionLiterals extends AbstractJetDiagnosticsTest { + public static class FunctionLiterals extends AbstractDiagnosticsTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignmentOperationInLambda.kt") public void testAssignmentOperationInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambda.kt"); doTest(fileName); } @TestMetadata("assignmentOperationInLambdaWithExpectedType.kt") public void testAssignmentOperationInLambdaWithExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt"); doTest(fileName); } @TestMetadata("DeprecatedSyntax.kt") public void testDeprecatedSyntax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt"); doTest(fileName); } @TestMetadata("ExpectedParameterTypeMismatchVariance.kt") public void testExpectedParameterTypeMismatchVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt"); doTest(fileName); } @TestMetadata("ExpectedParametersTypesMismatch.kt") public void testExpectedParametersTypesMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt"); doTest(fileName); } @TestMetadata("functionLIteralInBlockInIf.kt") public void testFunctionLIteralInBlockInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt"); doTest(fileName); } @TestMetadata("functionLiteralInIf.kt") public void testFunctionLiteralInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.kt"); doTest(fileName); } @TestMetadata("functionLiteralWithoutArgumentList.kt") public void testFunctionLiteralWithoutArgumentList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt"); doTest(fileName); } @TestMetadata("kt2906.kt") public void testKt2906() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt"); doTest(fileName); } @TestMetadata("kt3343.kt") public void testKt3343() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt3343.kt"); doTest(fileName); } @TestMetadata("kt4529.kt") public void testKt4529() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt"); doTest(fileName); } @TestMetadata("kt6541_extensionForExtensionFunction.kt") public void testKt6541_extensionForExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt6541_extensionForExtensionFunction.kt"); doTest(fileName); } @TestMetadata("kt6869.kt") public void testKt6869() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt6869.kt"); doTest(fileName); } @TestMetadata("kt7383_starProjectedFunction.kt") public void testKt7383_starProjectedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt"); doTest(fileName); } @TestMetadata("LabeledFunctionLiterals.kt") public void testLabeledFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("returnNull.kt") public void testReturnNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/returnNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/returnNull.kt"); doTest(fileName); } @TestMetadata("returnNullWithReturn.kt") public void testReturnNullWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt"); doTest(fileName); } @TestMetadata("unusedLiteral.kt") public void testUnusedLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.kt"); doTest(fileName); } @TestMetadata("unusedLiteralInsideUnitLiteral.kt") public void testUnusedLiteralInsideUnitLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals/return") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Return extends AbstractJetDiagnosticsTest { + public static class Return extends AbstractDiagnosticsTest { public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals/return"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoLabels.kt") public void testAutoLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt"); doTest(fileName); } @TestMetadata("AutoLabelsNonLocal.kt") public void testAutoLabelsNonLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt"); doTest(fileName); } @TestMetadata("ForbiddenNonLocalReturnNoType.kt") public void testForbiddenNonLocalReturnNoType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt"); doTest(fileName); } @TestMetadata("IfInReturnedExpression.kt") public void testIfInReturnedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfInReturnedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfInReturnedExpression.kt"); doTest(fileName); } @TestMetadata("IfWithoutElse.kt") public void testIfWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElse.kt"); doTest(fileName); } @TestMetadata("IfWithoutElseWithExplicitType.kt") public void testIfWithoutElseWithExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElseWithExplicitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/IfWithoutElseWithExplicitType.kt"); doTest(fileName); } @TestMetadata("LambdaWithParameter.kt") public void testLambdaWithParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LambdaWithParameter.kt"); doTest(fileName); } @TestMetadata("LocalAndNonLocalReturnInLambda.kt") public void testLocalAndNonLocalReturnInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt"); doTest(fileName); } @TestMetadata("LocalReturnExplicitLabelNoParens.kt") public void testLocalReturnExplicitLabelNoParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt"); doTest(fileName); } @TestMetadata("LocalReturnExplicitLabelParens.kt") public void testLocalReturnExplicitLabelParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt"); doTest(fileName); } @TestMetadata("LocalReturnHasTypeNothing.kt") public void testLocalReturnHasTypeNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.kt"); doTest(fileName); } @TestMetadata("LocalReturnInNestedFunction.kt") public void testLocalReturnInNestedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt"); doTest(fileName); } @TestMetadata("LocalReturnInNestedLambda.kt") public void testLocalReturnInNestedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt"); doTest(fileName); } @TestMetadata("LocalReturnNoCoercionToUnit.kt") public void testLocalReturnNoCoercionToUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt"); doTest(fileName); } @TestMetadata("LocalReturnNull.kt") public void testLocalReturnNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNull.kt"); doTest(fileName); } @TestMetadata("LocalReturnSecondUnit.kt") public void testLocalReturnSecondUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnSecondUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnSecondUnit.kt"); doTest(fileName); } @TestMetadata("LocalReturnUnit.kt") public void testLocalReturnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt"); doTest(fileName); } @TestMetadata("LocalReturnUnitAndDontCareType.kt") public void testLocalReturnUnitAndDontCareType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt"); doTest(fileName); } @TestMetadata("LocalReturnUnitWithBodyExpression.kt") public void testLocalReturnUnitWithBodyExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitWithBodyExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitWithBodyExpression.kt"); doTest(fileName); } @TestMetadata("LocalReturnWithExpectedType.kt") public void testLocalReturnWithExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.kt"); doTest(fileName); } @TestMetadata("LocalReturnWithExplicitUnit.kt") public void testLocalReturnWithExplicitUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExplicitUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExplicitUnit.kt"); doTest(fileName); } @TestMetadata("LocalReturnsWithExplicitReturnType.kt") public void testLocalReturnsWithExplicitReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt"); doTest(fileName); } @TestMetadata("MixedReturnsFromLambda.kt") public void testMixedReturnsFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt"); doTest(fileName); } @TestMetadata("NoCommonSystem.kt") public void testNoCommonSystem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt"); doTest(fileName); } @TestMetadata("SmartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt"); doTest(fileName); } @TestMetadata("SmartCastWithExplicitType.kt") public void testSmartCastWithExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/SmartCastWithExplicitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/SmartCastWithExplicitType.kt"); doTest(fileName); } @TestMetadata("unresolvedReferenceInReturnBlock.kt") public void testUnresolvedReferenceInReturnBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/unresolvedReferenceInReturnBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/unresolvedReferenceInReturnBlock.kt"); doTest(fileName); } } @@ -6517,124 +6517,124 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Generics extends AbstractJetDiagnosticsTest { + public static class Generics extends AbstractDiagnosticsTest { public void testAllFilesPresentInGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentsForT.kt") public void testArgumentsForT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/argumentsForT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/argumentsForT.kt"); doTest(fileName); } @TestMetadata("genericsInType.kt") public void testGenericsInType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/genericsInType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/genericsInType.kt"); doTest(fileName); } @TestMetadata("kt1575-Class.kt") public void testKt1575_Class() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Class.kt"); doTest(fileName); } @TestMetadata("kt1575-Function.kt") public void testKt1575_Function() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Function.kt"); doTest(fileName); } @TestMetadata("kt5508.kt") public void testKt5508() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt5508.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt5508.kt"); doTest(fileName); } @TestMetadata("Projections.kt") public void testProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/Projections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/Projections.kt"); doTest(fileName); } @TestMetadata("PseudoRawTypes.kt") public void testPseudoRawTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt"); doTest(fileName); } @TestMetadata("RawTypeInIsExpression.kt") public void testRawTypeInIsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.kt"); doTest(fileName); } @TestMetadata("RawTypeInIsPattern.kt") public void testRawTypeInIsPattern() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.kt"); doTest(fileName); } @TestMetadata("recursive.kt") public void testRecursive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/recursive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/recursive.kt"); doTest(fileName); } @TestMetadata("RecursiveUpperBoundCheck.kt") public void testRecursiveUpperBoundCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.kt"); doTest(fileName); } @TestMetadata("RecursiveUpperBoundWithTwoArguments.kt") public void testRecursiveUpperBoundWithTwoArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.kt"); doTest(fileName); } @TestMetadata("resolveGenericBoundsBeforeSupertypes.kt") public void testResolveGenericBoundsBeforeSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.kt"); doTest(fileName); } @TestMetadata("sameTypeParameterUse.kt") public void testSameTypeParameterUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/sameTypeParameterUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/sameTypeParameterUse.kt"); doTest(fileName); } @TestMetadata("suppressVarianceConflict.kt") public void testSuppressVarianceConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.kt"); doTest(fileName); } @TestMetadata("TypeParameterBounds.kt") public void testTypeParameterBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/TypeParameterBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/TypeParameterBounds.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/generics/cyclicBounds") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CyclicBounds extends AbstractJetDiagnosticsTest { + public static class CyclicBounds extends AbstractDiagnosticsTest { public void testAllFilesPresentInCyclicBounds() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/cyclicBounds"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/cyclicBounds"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/cyclicBounds/functions.kt"); doTest(fileName); } @TestMetadata("inClass.kt") public void testInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/cyclicBounds/inClass.kt"); doTest(fileName); } } @@ -6642,86 +6642,86 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/nullability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Nullability extends AbstractJetDiagnosticsTest { + public static class Nullability extends AbstractDiagnosticsTest { public void testAllFilesPresentInNullability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/nullability"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/nullability"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("declarationsBoundsViolation.kt") public void testDeclarationsBoundsViolation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/declarationsBoundsViolation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/declarationsBoundsViolation.kt"); doTest(fileName); } @TestMetadata("expressionsBoundsViolation.kt") public void testExpressionsBoundsViolation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt"); doTest(fileName); } @TestMetadata("functionalBound.kt") public void testFunctionalBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt"); doTest(fileName); } @TestMetadata("nullToGeneric.kt") public void testNullToGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt"); doTest(fileName); } @TestMetadata("smartCastRefinedClass.kt") public void testSmartCastRefinedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastRefinedClass.kt"); doTest(fileName); } @TestMetadata("smartCasts.kt") public void testSmartCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt"); doTest(fileName); } @TestMetadata("smartCastsOnThis.kt") public void testSmartCastsOnThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt"); doTest(fileName); } @TestMetadata("smartCastsValueArgument.kt") public void testSmartCastsValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt"); doTest(fileName); } @TestMetadata("tpBoundsViolation.kt") public void testTpBoundsViolation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt"); doTest(fileName); } @TestMetadata("tpBoundsViolationVariance.kt") public void testTpBoundsViolationVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt"); doTest(fileName); } @TestMetadata("tpInBounds.kt") public void testTpInBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt"); doTest(fileName); } @TestMetadata("useAsReceiver.kt") public void testUseAsReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt"); doTest(fileName); } @TestMetadata("useAsValueArgument.kt") public void testUseAsValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt"); doTest(fileName); } } @@ -6729,26 +6729,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/starProjections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StarProjections extends AbstractJetDiagnosticsTest { + public static class StarProjections extends AbstractDiagnosticsTest { public void testAllFilesPresentInStarProjections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/starProjections"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/starProjections"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("collectionInheritedFromJava.kt") public void testCollectionInheritedFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.kt"); doTest(fileName); } @TestMetadata("inheritedFromJava.kt") public void testInheritedFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/inheritedFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/inheritedFromJava.kt"); doTest(fileName); } @TestMetadata("inheritedFromKotlin.kt") public void testInheritedFromKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/inheritedFromKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/starProjections/inheritedFromKotlin.kt"); doTest(fileName); } } @@ -6756,62 +6756,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TpAsReified extends AbstractJetDiagnosticsTest { + public static class TpAsReified extends AbstractDiagnosticsTest { public void testAllFilesPresentInTpAsReified() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Conventions.kt") public void testConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.kt"); doTest(fileName); } @TestMetadata("InConstructor.kt") public void testInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt"); doTest(fileName); } @TestMetadata("InFunction.kt") public void testInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt"); doTest(fileName); } @TestMetadata("InProperty.kt") public void testInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt"); doTest(fileName); } @TestMetadata("InType.kt") public void testInType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InType.kt"); doTest(fileName); } @TestMetadata("InlineableReified.kt") public void testInlineableReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.kt"); doTest(fileName); } @TestMetadata("LocalFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.kt"); doTest(fileName); } @TestMetadata("NotInlineableReified.kt") public void testNotInlineableReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.kt"); doTest(fileName); } @TestMetadata("ReifiedClass.kt") public void testReifiedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.kt"); doTest(fileName); } } @@ -6819,32 +6819,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/varProjection") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class VarProjection extends AbstractJetDiagnosticsTest { + public static class VarProjection extends AbstractDiagnosticsTest { public void testAllFilesPresentInVarProjection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/varProjection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/varProjection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("setterNotProjectedOutAssign.kt") public void testSetterNotProjectedOutAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt"); doTest(fileName); } @TestMetadata("setterProjectedOutAssign.kt") public void testSetterProjectedOutAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt"); doTest(fileName); } @TestMetadata("setterProjectedOutNoPlusAssign.kt") public void testSetterProjectedOutNoPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt"); doTest(fileName); } @TestMetadata("setterProjectedOutPlusAssignDefined.kt") public void testSetterProjectedOutPlusAssignDefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.kt"); doTest(fileName); } } @@ -6853,284 +6853,284 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/imports") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Imports extends AbstractJetDiagnosticsTest { + public static class Imports extends AbstractDiagnosticsTest { public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/imports"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/imports"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AllUnderImportsAmbiguity.kt") public void testAllUnderImportsAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsAmbiguity.kt"); doTest(fileName); } @TestMetadata("AllUnderImportsLessPriority.kt") public void testAllUnderImportsLessPriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsLessPriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsLessPriority.kt"); doTest(fileName); } @TestMetadata("AllUnderImportsSamePriorityForFunction.kt") public void testAllUnderImportsSamePriorityForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForFunction.kt"); doTest(fileName); } @TestMetadata("AllUnderImportsSamePriorityForProperty.kt") public void testAllUnderImportsSamePriorityForProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt"); doTest(fileName); } @TestMetadata("CheckJavaVisibility.kt") public void testCheckJavaVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CheckJavaVisibility.kt"); doTest(fileName); } @TestMetadata("CheckVisibility.kt") public void testCheckVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CheckVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CheckVisibility.kt"); doTest(fileName); } @TestMetadata("ClassClash.kt") public void testClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassClash.kt"); doTest(fileName); } @TestMetadata("ClassClashStarImport.kt") public void testClassClashStarImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt"); doTest(fileName); } @TestMetadata("ClassImportsConflicting.kt") public void testClassImportsConflicting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ClassImportsConflicting.kt"); doTest(fileName); } @TestMetadata("CurrentPackageAndAllUnderImport.kt") public void testCurrentPackageAndAllUnderImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndAllUnderImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndAllUnderImport.kt"); doTest(fileName); } @TestMetadata("CurrentPackageAndExplicitImport.kt") public void testCurrentPackageAndExplicitImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndExplicitImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/CurrentPackageAndExplicitImport.kt"); doTest(fileName); } @TestMetadata("DefaultImportsPriority.kt") public void testDefaultImportsPriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/DefaultImportsPriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/DefaultImportsPriority.kt"); doTest(fileName); } @TestMetadata("ExplicitImportsAmbiguity.kt") public void testExplicitImportsAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.kt"); doTest(fileName); } @TestMetadata("ExplicitImportsUnambiguityForFunction.kt") public void testExplicitImportsUnambiguityForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitImportsUnambiguityForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitImportsUnambiguityForFunction.kt"); doTest(fileName); } @TestMetadata("ExplicitPackageImportsAmbiguity.kt") public void testExplicitPackageImportsAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitPackageImportsAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ExplicitPackageImportsAmbiguity.kt"); doTest(fileName); } @TestMetadata("ImportClassClash.kt") public void testImportClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportClassClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportClassClash.kt"); doTest(fileName); } @TestMetadata("ImportFromCompanionObject.kt") public void testImportFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.kt"); doTest(fileName); } @TestMetadata("ImportFromCurrentWithDifferentName.kt") public void testImportFromCurrentWithDifferentName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt"); doTest(fileName); } @TestMetadata("ImportFromObject.kt") public void testImportFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromObject.kt"); doTest(fileName); } @TestMetadata("ImportFromRootPackage.kt") public void testImportFromRootPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt"); doTest(fileName); } @TestMetadata("importFunctionWithAllUnderImport.kt") public void testImportFunctionWithAllUnderImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImport.kt"); doTest(fileName); } @TestMetadata("importFunctionWithAllUnderImportAfterNamedImport.kt") public void testImportFunctionWithAllUnderImportAfterNamedImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/importFunctionWithAllUnderImportAfterNamedImport.kt"); doTest(fileName); } @TestMetadata("ImportHidingDefinitionInTheSameFile.kt") public void testImportHidingDefinitionInTheSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt"); doTest(fileName); } @TestMetadata("ImportObjectAndUseAsSupertype.kt") public void testImportObjectAndUseAsSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectAndUseAsSupertype.kt"); doTest(fileName); } @TestMetadata("ImportObjectHidesCurrentPackage.kt") public void testImportObjectHidesCurrentPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportObjectHidesCurrentPackage.kt"); doTest(fileName); } @TestMetadata("ImportOverloadFunctions.kt") public void testImportOverloadFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt"); doTest(fileName); } @TestMetadata("ImportProtectedClass.kt") public void testImportProtectedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportProtectedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportProtectedClass.kt"); doTest(fileName); } @TestMetadata("ImportResolutionOrder.kt") public void testImportResolutionOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt"); doTest(fileName); } @TestMetadata("ImportTwoTimes.kt") public void testImportTwoTimes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimes.kt"); doTest(fileName); } @TestMetadata("ImportTwoTimesStar.kt") public void testImportTwoTimesStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportTwoTimesStar.kt"); doTest(fileName); } @TestMetadata("Imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/Imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/Imports.kt"); doTest(fileName); } @TestMetadata("ImportsConflicting.kt") public void testImportsConflicting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsConflicting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsConflicting.kt"); doTest(fileName); } @TestMetadata("JavaPackageLocalClassNotImported.kt") public void testJavaPackageLocalClassNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/JavaPackageLocalClassNotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/JavaPackageLocalClassNotImported.kt"); doTest(fileName); } @TestMetadata("MalformedImports.kt") public void testMalformedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/MalformedImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/MalformedImports.kt"); doTest(fileName); } @TestMetadata("NestedClassClash.kt") public void testNestedClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/NestedClassClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/NestedClassClash.kt"); doTest(fileName); } @TestMetadata("PackageLocalClassNotImported.kt") public void testPackageLocalClassNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageLocalClassNotImported.kt"); doTest(fileName); } @TestMetadata("PackageLocalClassReferencedError.kt") public void testPackageLocalClassReferencedError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt"); doTest(fileName); } @TestMetadata("PackageVsClass.kt") public void testPackageVsClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageVsClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PackageVsClass.kt"); doTest(fileName); } @TestMetadata("PrivateClassNotImported.kt") public void testPrivateClassNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PrivateClassNotImported.kt"); doTest(fileName); } @TestMetadata("PrivateClassReferencedError.kt") public void testPrivateClassReferencedError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt"); doTest(fileName); } @TestMetadata("propertyClassFileDependencyRecursion.kt") public void testPropertyClassFileDependencyRecursion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/propertyClassFileDependencyRecursion.kt"); doTest(fileName); } @TestMetadata("RenameOnImport.kt") public void testRenameOnImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt"); doTest(fileName); } @TestMetadata("StarImportFromObject.kt") public void testStarImportFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/StarImportFromObject.kt"); doTest(fileName); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/SyntaxError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/SyntaxError.kt"); doTest(fileName); } @TestMetadata("TopLevelClassVsPackage.kt") public void testTopLevelClassVsPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.kt"); doTest(fileName); } @TestMetadata("WrongImport.kt") public void testWrongImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/WrongImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/WrongImport.kt"); doTest(fileName); } } @@ -7138,202 +7138,202 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IncompleteCode extends AbstractJetDiagnosticsTest { + public static class IncompleteCode extends AbstractDiagnosticsTest { public void testAllFilesPresentInIncompleteCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayBracketsRange.kt") public void testArrayBracketsRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt"); doTest(fileName); } @TestMetadata("checkNothingIsSubtype.kt") public void testCheckNothingIsSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt"); doTest(fileName); } @TestMetadata("controlStructuresErrors.kt") public void testControlStructuresErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt"); doTest(fileName); } @TestMetadata("inExpr.kt") public void testInExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/inExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/inExpr.kt"); doTest(fileName); } @TestMetadata("incompleteAssignment.kt") public void testIncompleteAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt"); doTest(fileName); } @TestMetadata("incompleteEquals.kt") public void testIncompleteEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt"); doTest(fileName); } @TestMetadata("kt1955.kt") public void testKt1955() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt1955.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt1955.kt"); doTest(fileName); } @TestMetadata("kt2014.kt") public void testKt2014() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt"); doTest(fileName); } @TestMetadata("kt4866UnresolvedArrayAccess.kt") public void testKt4866UnresolvedArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.kt"); doTest(fileName); } @TestMetadata("NoSenselessComparisonForErrorType.kt") public void testNoSenselessComparisonForErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt"); doTest(fileName); } @TestMetadata("plusOnTheRight.kt") public void testPlusOnTheRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt"); doTest(fileName); } @TestMetadata("pseudocodeTraverseNextInstructions.kt") public void testPseudocodeTraverseNextInstructions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt"); doTest(fileName); } @TestMetadata("senselessComparisonWithNull.kt") public void testSenselessComparisonWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.kt"); doTest(fileName); } @TestMetadata("SupertypeOfErrorType.kt") public void testSupertypeOfErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.kt"); doTest(fileName); } @TestMetadata("typeParameterOnLhsOfDot.kt") public void testTypeParameterOnLhsOfDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.kt"); doTest(fileName); } @TestMetadata("unresolvedArguments.kt") public void testUnresolvedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt"); doTest(fileName); } @TestMetadata("unresolvedOperation.kt") public void testUnresolvedOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.kt"); doTest(fileName); } @TestMetadata("variableDeclarationInSelector.kt") public void testVariableDeclarationInSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DiagnosticWithSyntaxError extends AbstractJetDiagnosticsTest { + public static class DiagnosticWithSyntaxError extends AbstractDiagnosticsTest { public void testAllFilesPresentInDiagnosticWithSyntaxError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayExpression.kt") public void testArrayExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt"); doTest(fileName); } @TestMetadata("checkBackingFieldException.kt") public void testCheckBackingFieldException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt"); doTest(fileName); } @TestMetadata("completeFunctionArgumentsOfNestedCalls.kt") public void testCompleteFunctionArgumentsOfNestedCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt"); doTest(fileName); } @TestMetadata("funEquals.kt") public void testFunEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.kt"); doTest(fileName); } @TestMetadata("funKeyword.kt") public void testFunKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.kt"); doTest(fileName); } @TestMetadata("funcitonTypes.kt") public void testFuncitonTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.kt"); doTest(fileName); } @TestMetadata("incompleteEnumReference.kt") public void testIncompleteEnumReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.kt"); doTest(fileName); } @TestMetadata("incompleteVal.kt") public void testIncompleteVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.kt"); doTest(fileName); } @TestMetadata("incompleteValWithAccessor.kt") public void testIncompleteValWithAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.kt"); doTest(fileName); } @TestMetadata("incompleteWhen.kt") public void testIncompleteWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.kt"); doTest(fileName); } @TestMetadata("namedFun.kt") public void testNamedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.kt"); doTest(fileName); } @TestMetadata("noTypeParamsInReturnType.kt") public void testNoTypeParamsInReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt"); doTest(fileName); } @TestMetadata("typeReferenceError.kt") public void testTypeReferenceError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt"); doTest(fileName); } } @@ -7342,286 +7342,286 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractJetDiagnosticsTest { + public static class Inference extends AbstractDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cannotCompleteResolveAmbiguity.kt") public void testCannotCompleteResolveAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt"); doTest(fileName); } @TestMetadata("cannotCompleteResolveFunctionLiteralsNoUse.kt") public void testCannotCompleteResolveFunctionLiteralsNoUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt"); doTest(fileName); } @TestMetadata("cannotCompleteResolveNoInfoForParameter.kt") public void testCannotCompleteResolveNoInfoForParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt"); doTest(fileName); } @TestMetadata("cannotCompleteResolveNoneApplicable.kt") public void testCannotCompleteResolveNoneApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.kt"); doTest(fileName); } @TestMetadata("cannotCompleteResolveWithFunctionLiterals.kt") public void testCannotCompleteResolveWithFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("completeInferenceIfManyFailed.kt") public void testCompleteInferenceIfManyFailed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt"); doTest(fileName); } @TestMetadata("conflictingSubstitutions.kt") public void testConflictingSubstitutions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt"); doTest(fileName); } @TestMetadata("dependOnExpectedType.kt") public void testDependOnExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt"); doTest(fileName); } @TestMetadata("dependantOnVariance.kt") public void testDependantOnVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt"); doTest(fileName); } @TestMetadata("dependantOnVarianceNullable.kt") public void testDependantOnVarianceNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.kt"); doTest(fileName); } @TestMetadata("functionPlaceholderError.kt") public void testFunctionPlaceholderError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt"); doTest(fileName); } @TestMetadata("hasErrorInConstrainingTypes.kt") public void testHasErrorInConstrainingTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt"); doTest(fileName); } @TestMetadata("immutableArrayList.kt") public void testImmutableArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/immutableArrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/immutableArrayList.kt"); doTest(fileName); } @TestMetadata("inferInFunctionLiterals.kt") public void testInferInFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("inferInFunctionLiteralsWithReturn.kt") public void testInferInFunctionLiteralsWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.kt"); doTest(fileName); } @TestMetadata("kt1293.kt") public void testKt1293() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt1293.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt1293.kt"); doTest(fileName); } @TestMetadata("kt3184.kt") public void testKt3184() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt3184.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt3184.kt"); doTest(fileName); } @TestMetadata("kt6175.kt") public void testKt6175() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt6175.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt6175.kt"); doTest(fileName); } @TestMetadata("kt619.kt") public void testKt619() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt619.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt619.kt"); doTest(fileName); } @TestMetadata("listConstructor.kt") public void testListConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/listConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/listConstructor.kt"); doTest(fileName); } @TestMetadata("mapFunction.kt") public void testMapFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mapFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mapFunction.kt"); doTest(fileName); } @TestMetadata("mostSpecificAfterInference.kt") public void testMostSpecificAfterInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt"); doTest(fileName); } @TestMetadata("NoInferenceFromDeclaredBounds.kt") public void testNoInferenceFromDeclaredBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt"); doTest(fileName); } @TestMetadata("noInformationForParameter.kt") public void testNoInformationForParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt"); doTest(fileName); } @TestMetadata("nullableUpperBound.kt") public void testNullableUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nullableUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nullableUpperBound.kt"); doTest(fileName); } @TestMetadata("opposite.kt") public void testOpposite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/opposite.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/opposite.kt"); doTest(fileName); } @TestMetadata("possibleCycleOnConstraints.kt") public void testPossibleCycleOnConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt"); doTest(fileName); } @TestMetadata("tryNumberLowerBoundsBeforeUpperBounds.kt") public void testTryNumberLowerBoundsBeforeUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt"); doTest(fileName); } @TestMetadata("typeConstructorMismatch.kt") public void testTypeConstructorMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt"); doTest(fileName); } @TestMetadata("typeInferenceExpectedTypeMismatch.kt") public void testTypeInferenceExpectedTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt"); doTest(fileName); } @TestMetadata("useFunctionLiteralsToInferType.kt") public void testUseFunctionLiteralsToInferType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CapturedTypes extends AbstractJetDiagnosticsTest { + public static class CapturedTypes extends AbstractDiagnosticsTest { public void testAllFilesPresentInCapturedTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/capturedTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/capturedTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cannotCaptureInProjection.kt") public void testCannotCaptureInProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt"); doTest(fileName); } @TestMetadata("captureForNullableTypes.kt") public void testCaptureForNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt"); doTest(fileName); } @TestMetadata("captureForPlatformTypes.kt") public void testCaptureForPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureForPlatformTypes.kt"); doTest(fileName); } @TestMetadata("captureFromNullableTypeVariable.kt") public void testCaptureFromNullableTypeVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt"); doTest(fileName); } @TestMetadata("captureTypeOnlyOnTopLevel.kt") public void testCaptureTypeOnlyOnTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt"); doTest(fileName); } @TestMetadata("capturedType.kt") public void testCapturedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedType.kt"); doTest(fileName); } @TestMetadata("capturedTypeAndApproximation.kt") public void testCapturedTypeAndApproximation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeAndApproximation.kt"); doTest(fileName); } @TestMetadata("capturedTypeSubstitutedIntoOppositeProjection.kt") public void testCapturedTypeSubstitutedIntoOppositeProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt"); doTest(fileName); } @TestMetadata("expectedTypeMismatchWithInVariance.kt") public void testExpectedTypeMismatchWithInVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt"); doTest(fileName); } @TestMetadata("kt2570.kt") public void testKt2570() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.kt"); doTest(fileName); } @TestMetadata("kt2872.kt") public void testKt2872() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt"); doTest(fileName); } @TestMetadata("notApproximateWhenCopyDescriptors.kt") public void testNotApproximateWhenCopyDescriptors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/notApproximateWhenCopyDescriptors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/notApproximateWhenCopyDescriptors.kt"); doTest(fileName); } @TestMetadata("overApproximationForInCaptured.kt") public void testOverApproximationForInCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForInCaptured.kt"); doTest(fileName); } @TestMetadata("overApproximationForOutCaptured.kt") public void testOverApproximationForOutCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/capturedTypes/overApproximationForOutCaptured.kt"); doTest(fileName); } } @@ -7629,56 +7629,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/commonSystem") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CommonSystem extends AbstractJetDiagnosticsTest { + public static class CommonSystem extends AbstractDiagnosticsTest { public void testAllFilesPresentInCommonSystem() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/commonSystem"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/commonSystem"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boundOnNullableVariable.kt") public void testBoundOnNullableVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/boundOnNullableVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/boundOnNullableVariable.kt"); doTest(fileName); } @TestMetadata("dontCaptureTypeVariable.kt") public void testDontCaptureTypeVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.kt"); doTest(fileName); } @TestMetadata("fixVariablesInRightOrder.kt") public void testFixVariablesInRightOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.kt"); doTest(fileName); } @TestMetadata("genericCandidateInGenericClass.kt") public void testGenericCandidateInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.kt"); doTest(fileName); } @TestMetadata("inferenceWithUpperBoundsInLambda.kt") public void testInferenceWithUpperBoundsInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.kt"); doTest(fileName); } @TestMetadata("kt3372toCollection.kt") public void testKt3372toCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.kt"); doTest(fileName); } @TestMetadata("nestedLambdas.kt") public void testNestedLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.kt"); doTest(fileName); } @TestMetadata("theSameFunctionInArgs.kt") public void testTheSameFunctionInArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/commonSystem/theSameFunctionInArgs.kt"); doTest(fileName); } } @@ -7686,68 +7686,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/constraints") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Constraints extends AbstractJetDiagnosticsTest { + public static class Constraints extends AbstractDiagnosticsTest { public void testAllFilesPresentInConstraints() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/constraints"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/constraints"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constraintOnFunctionLiteral.kt") public void testConstraintOnFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("equalityConstraintOnNullableType.kt") public void testEqualityConstraintOnNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt"); doTest(fileName); } @TestMetadata("ignoreConstraintFromImplicitInNothing.kt") public void testIgnoreConstraintFromImplicitInNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt"); doTest(fileName); } @TestMetadata("kt6320.kt") public void testKt6320() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt"); doTest(fileName); } @TestMetadata("kt7351ConstraintFromUnitExpectedType.kt") public void testKt7351ConstraintFromUnitExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt7351ConstraintFromUnitExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt7351ConstraintFromUnitExpectedType.kt"); doTest(fileName); } @TestMetadata("kt7433.kt") public void testKt7433() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt7433.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt7433.kt"); doTest(fileName); } @TestMetadata("kt8879.kt") public void testKt8879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt"); doTest(fileName); } @TestMetadata("notNullConstraintOnNullableType.kt") public void testNotNullConstraintOnNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt"); doTest(fileName); } @TestMetadata("subtypeConstraintOnNullableType.kt") public void testSubtypeConstraintOnNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt"); doTest(fileName); } @TestMetadata("supertypeConstraintOnNullableType.kt") public void testSupertypeConstraintOnNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt"); doTest(fileName); } } @@ -7755,74 +7755,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NestedCalls extends AbstractJetDiagnosticsTest { + public static class NestedCalls extends AbstractDiagnosticsTest { public void testAllFilesPresentInNestedCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.kt"); doTest(fileName); } @TestMetadata("binaryExpressions.kt") public void testBinaryExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt"); doTest(fileName); } @TestMetadata("checkTypesForQualifiedProperties.kt") public void testCheckTypesForQualifiedProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.kt"); doTest(fileName); } @TestMetadata("completeNestedCallsForArraySetExpression.kt") public void testCompleteNestedCallsForArraySetExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.kt"); doTest(fileName); } @TestMetadata("completeNestedCallsInference.kt") public void testCompleteNestedCallsInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.kt"); doTest(fileName); } @TestMetadata("completeNestedForVariableAsFunctionCall.kt") public void testCompleteNestedForVariableAsFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.kt"); doTest(fileName); } @TestMetadata("inferenceForNestedBinaryCall.kt") public void testInferenceForNestedBinaryCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt"); doTest(fileName); } @TestMetadata("kt3395.kt") public void testKt3395() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.kt"); doTest(fileName); } @TestMetadata("kt3461checkTypes.kt") public void testKt3461checkTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.kt"); doTest(fileName); } @TestMetadata("makeNullableIfSafeCall.kt") public void testMakeNullableIfSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.kt"); doTest(fileName); } @TestMetadata("nontrivialCallExpression.kt") public void testNontrivialCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.kt"); doTest(fileName); } } @@ -7830,314 +7830,314 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/regressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Regressions extends AbstractJetDiagnosticsTest { + public static class Regressions extends AbstractDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compareBy.kt") public void testCompareBy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt"); doTest(fileName); } @TestMetadata("kt1029.kt") public void testKt1029() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt"); doTest(fileName); } @TestMetadata("kt1031.kt") public void testKt1031() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt"); doTest(fileName); } @TestMetadata("kt1127.kt") public void testKt1127() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt"); doTest(fileName); } @TestMetadata("kt1145.kt") public void testKt1145() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt"); doTest(fileName); } @TestMetadata("kt1358.kt") public void testKt1358() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt"); doTest(fileName); } @TestMetadata("kt1410.kt") public void testKt1410() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt"); doTest(fileName); } @TestMetadata("kt1718.kt") public void testKt1718() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt"); doTest(fileName); } @TestMetadata("kt1944.kt") public void testKt1944() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt"); doTest(fileName); } @TestMetadata("kt2057.kt") public void testKt2057() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2057.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2057.kt"); doTest(fileName); } @TestMetadata("kt2179.kt") public void testKt2179() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt"); doTest(fileName); } @TestMetadata("kt2200.kt") public void testKt2200() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt"); doTest(fileName); } @TestMetadata("kt2283.kt") public void testKt2283() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt"); doTest(fileName); } @TestMetadata("kt2286.kt") public void testKt2286() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt"); doTest(fileName); } @TestMetadata("kt2294.kt") public void testKt2294() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt"); doTest(fileName); } @TestMetadata("kt2320.kt") public void testKt2320() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2320.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2320.kt"); doTest(fileName); } @TestMetadata("kt2324.kt") public void testKt2324() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt"); doTest(fileName); } @TestMetadata("kt2407.kt") public void testKt2407() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt"); doTest(fileName); } @TestMetadata("kt2445.kt") public void testKt2445() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt"); doTest(fileName); } @TestMetadata("kt2459.kt") public void testKt2459() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2459.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2459.kt"); doTest(fileName); } @TestMetadata("kt2484.kt") public void testKt2484() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt"); doTest(fileName); } @TestMetadata("kt2505.kt") public void testKt2505() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt"); doTest(fileName); } @TestMetadata("kt2514.kt") public void testKt2514() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt"); doTest(fileName); } @TestMetadata("kt2588.kt") public void testKt2588() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2588.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2588.kt"); doTest(fileName); } @TestMetadata("kt2741.kt") public void testKt2741() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt"); doTest(fileName); } @TestMetadata("kt2754.kt") public void testKt2754() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2754.kt"); doTest(fileName); } @TestMetadata("kt2838.kt") public void testKt2838() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt"); doTest(fileName); } @TestMetadata("kt2841.kt") public void testKt2841() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt"); doTest(fileName); } @TestMetadata("kt2841_it.kt") public void testKt2841_it() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt"); doTest(fileName); } @TestMetadata("kt2841_it_this.kt") public void testKt2841_it_this() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt"); doTest(fileName); } @TestMetadata("kt2841_this.kt") public void testKt2841_this() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt"); doTest(fileName); } @TestMetadata("kt2842.kt") public void testKt2842() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt"); doTest(fileName); } @TestMetadata("kt2883.kt") public void testKt2883() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt"); doTest(fileName); } @TestMetadata("kt3007.kt") public void testKt3007() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3007.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3007.kt"); doTest(fileName); } @TestMetadata("kt3038.kt") public void testKt3038() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3038.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3038.kt"); doTest(fileName); } @TestMetadata("kt3150.kt") public void testKt3150() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt"); doTest(fileName); } @TestMetadata("kt3174.kt") public void testKt3174() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3174.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3174.kt"); doTest(fileName); } @TestMetadata("kt3301.kt") public void testKt3301() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3301.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3301.kt"); doTest(fileName); } @TestMetadata("kt3344.kt") public void testKt3344() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3344.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3344.kt"); doTest(fileName); } @TestMetadata("kt3496.kt") public void testKt3496() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3496.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3496.kt"); doTest(fileName); } @TestMetadata("kt3496_2.kt") public void testKt3496_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3496_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3496_2.kt"); doTest(fileName); } @TestMetadata("kt3559.kt") public void testKt3559() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3559.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3559.kt"); doTest(fileName); } @TestMetadata("kt4420.kt") public void testKt4420() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt"); doTest(fileName); } @TestMetadata("kt702.kt") public void testKt702() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt702.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt702.kt"); doTest(fileName); } @TestMetadata("kt731.kt") public void testKt731() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt731.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt731.kt"); doTest(fileName); } @TestMetadata("kt742.kt") public void testKt742() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt742.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt742.kt"); doTest(fileName); } @TestMetadata("kt8132.kt") public void testKt8132() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt8132.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt8132.kt"); doTest(fileName); } @TestMetadata("kt832.kt") public void testKt832() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt832.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt832.kt"); doTest(fileName); } @TestMetadata("kt943.kt") public void testKt943() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt943.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt943.kt"); doTest(fileName); } @TestMetadata("kt9461.kt") public void testKt9461() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt9461.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt9461.kt"); doTest(fileName); } @TestMetadata("kt948.kt") public void testKt948() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt948.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt948.kt"); doTest(fileName); } } @@ -8145,38 +8145,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ReportingImprovements extends AbstractJetDiagnosticsTest { + public static class ReportingImprovements extends AbstractDiagnosticsTest { public void testAllFilesPresentInReportingImprovements() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cannotInferParameterTypeWithInference.kt") public void testCannotInferParameterTypeWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt"); doTest(fileName); } @TestMetadata("ErrorTypeAsGenericParameter.kt") public void testErrorTypeAsGenericParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt"); doTest(fileName); } @TestMetadata("FunctionPlaceholder.kt") public void testFunctionPlaceholder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt"); doTest(fileName); } @TestMetadata("NoAmbiguityForDifferentFunctionTypes.kt") public void testNoAmbiguityForDifferentFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt"); doTest(fileName); } @TestMetadata("subtypeForInvariantWithErrorGenerics.kt") public void testSubtypeForInvariantWithErrorGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt"); doTest(fileName); } } @@ -8184,38 +8184,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/substitutions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Substitutions extends AbstractJetDiagnosticsTest { + public static class Substitutions extends AbstractDiagnosticsTest { public void testAllFilesPresentInSubstitutions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/substitutions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/substitutions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegationAndInference.kt") public void testDelegationAndInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.kt"); doTest(fileName); } @TestMetadata("kt6081SubstituteIntoClassCorrectly.kt") public void testKt6081SubstituteIntoClassCorrectly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/kt6081SubstituteIntoClassCorrectly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/kt6081SubstituteIntoClassCorrectly.kt"); doTest(fileName); } @TestMetadata("simpleSubstitutionCheckTypeArgumentsNotTypeParameters.kt") public void testSimpleSubstitutionCheckTypeArgumentsNotTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/simpleSubstitutionCheckTypeArgumentsNotTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/simpleSubstitutionCheckTypeArgumentsNotTypeParameters.kt"); doTest(fileName); } @TestMetadata("substitutionIntoAnonymousClass.kt") public void testSubstitutionIntoAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoAnonymousClass.kt"); doTest(fileName); } @TestMetadata("substitutionIntoInnerClass.kt") public void testSubstitutionIntoInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/substitutions/substitutionIntoInnerClass.kt"); doTest(fileName); } } @@ -8223,50 +8223,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/upperBounds") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UpperBounds extends AbstractJetDiagnosticsTest { + public static class UpperBounds extends AbstractDiagnosticsTest { public void testAllFilesPresentInUpperBounds() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/upperBounds"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/upperBounds"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conflictingSubstitutionsFromUpperBound.kt") public void testConflictingSubstitutionsFromUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt"); doTest(fileName); } @TestMetadata("doNotInferFromBoundsOnly.kt") public void testDoNotInferFromBoundsOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt"); doTest(fileName); } @TestMetadata("intersectUpperBounds.kt") public void testIntersectUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt"); doTest(fileName); } @TestMetadata("kt2856.kt") public void testKt2856() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt"); doTest(fileName); } @TestMetadata("nonNullUpperBound.kt") public void testNonNullUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.kt"); doTest(fileName); } @TestMetadata("useBoundsIfUnknownParameters.kt") public void testUseBoundsIfUnknownParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt"); doTest(fileName); } @TestMetadata("useBoundsToInferTypeParamsSimple.kt") public void testUseBoundsToInferTypeParamsSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt"); doTest(fileName); } } @@ -8275,20 +8275,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/infos") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Infos extends AbstractJetDiagnosticsTest { + public static class Infos extends AbstractDiagnosticsTest { public void testAllFilesPresentInInfos() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/infos"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/infos"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropertiesWithBackingFields.kt") public void testPropertiesWithBackingFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt"); doTest(fileName); } @TestMetadata("SmartCasts.kt") public void testSmartCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/SmartCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/SmartCasts.kt"); doTest(fileName); } } @@ -8296,238 +8296,238 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractJetDiagnosticsTest { + public static class Inline extends AbstractDiagnosticsTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/anonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/anonymousObjects.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/assignment.kt"); doTest(fileName); } @TestMetadata("capture.kt") public void testCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/capture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/capture.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/constructor.kt"); doTest(fileName); } @TestMetadata("default.kt") public void testDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/default.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/default.kt"); doTest(fileName); } @TestMetadata("extensionOnFunction.kt") public void testExtensionOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/extensionOnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/extensionOnFunction.kt"); doTest(fileName); } @TestMetadata("fromInlineToNoInline.kt") public void testFromInlineToNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.kt"); doTest(fileName); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/functions.kt"); doTest(fileName); } @TestMetadata("inlineReified.kt") public void testInlineReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/inlineReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/inlineReified.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/invoke.kt"); doTest(fileName); } @TestMetadata("isCheck.kt") public void testIsCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/isCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/isCheck.kt"); doTest(fileName); } @TestMetadata("kt4869.kt") public void testKt4869() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/kt4869.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/kt4869.kt"); doTest(fileName); } @TestMetadata("labeled.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/labeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/labeled.kt"); doTest(fileName); } @TestMetadata("lambdaCast.kt") public void testLambdaCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/lambdaCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/lambdaCast.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/localFun.kt"); doTest(fileName); } @TestMetadata("nonVirtualMembersWithInline.kt") public void testNonVirtualMembersWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.kt"); doTest(fileName); } @TestMetadata("nothingToInline.kt") public void testNothingToInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nothingToInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nothingToInline.kt"); doTest(fileName); } @TestMetadata("nullabilityOperations.kt") public void testNullabilityOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullabilityOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullabilityOperations.kt"); doTest(fileName); } @TestMetadata("nullableFunction.kt") public void testNullableFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullableFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullableFunction.kt"); doTest(fileName); } @TestMetadata("parenthesized.kt") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/parenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/parenthesized.kt"); doTest(fileName); } @TestMetadata("propagation.kt") public void testPropagation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/propagation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/propagation.kt"); doTest(fileName); } @TestMetadata("recursion.kt") public void testRecursion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/recursion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/recursion.kt"); doTest(fileName); } @TestMetadata("returns.kt") public void testReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/returns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/returns.kt"); doTest(fileName); } @TestMetadata("sam.kt") public void testSam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/sam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/sam.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/stringTemplate.kt"); doTest(fileName); } @TestMetadata("unsupportedConstruction.kt") public void testUnsupportedConstruction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unsupportedConstruction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unsupportedConstruction.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/vararg.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/when.kt"); doTest(fileName); } @TestMetadata("wrongUsage.kt") public void testWrongUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/wrongUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/wrongUsage.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class BinaryExpressions extends AbstractJetDiagnosticsTest { + public static class BinaryExpressions extends AbstractDiagnosticsTest { public void testAllFilesPresentInBinaryExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/binaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/binaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("andOr.kt") public void testAndOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.kt"); doTest(fileName); } @TestMetadata("arrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.kt"); doTest(fileName); } @TestMetadata("comparison.kt") public void testComparison() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.kt"); doTest(fileName); } @TestMetadata("componentAccess.kt") public void testComponentAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.kt"); doTest(fileName); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.kt"); doTest(fileName); } @TestMetadata("mathOperations.kt") public void testMathOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.kt"); doTest(fileName); } @TestMetadata("rangeTo.kt") public void testRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt"); doTest(fileName); } } @@ -8535,116 +8535,116 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NonLocalReturns extends AbstractJetDiagnosticsTest { + public static class NonLocalReturns extends AbstractDiagnosticsTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt"); doTest(fileName); } @TestMetadata("anonymousObjectsNested.kt") public void testAnonymousObjectsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt"); doTest(fileName); } @TestMetadata("explicitReturnType.kt") public void testExplicitReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.kt"); doTest(fileName); } @TestMetadata("fromOnlyLocal.kt") public void testFromOnlyLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt"); doTest(fileName); } @TestMetadata("inlineLambda.kt") public void testInlineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt"); doTest(fileName); } @TestMetadata("labeledReturn.kt") public void testLabeledReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.kt"); doTest(fileName); } @TestMetadata("lambdaAsGeneric.kt") public void testLambdaAsGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt"); doTest(fileName); } @TestMetadata("lambdaAsNonFunction.kt") public void testLambdaAsNonFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsNonFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsNonFunction.kt"); doTest(fileName); } @TestMetadata("lambdaWithGlobalReturnsInsideOnlyLocalOne.kt") public void testLambdaWithGlobalReturnsInsideOnlyLocalOne() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt"); doTest(fileName); } @TestMetadata("nestedNonLocals.kt") public void testNestedNonLocals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.kt"); doTest(fileName); } @TestMetadata("noInlineAnnotation.kt") public void testNoInlineAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.kt"); doTest(fileName); } @TestMetadata("noInlineLambda.kt") public void testNoInlineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt"); doTest(fileName); } @TestMetadata("nonInlinedClass.kt") public void testNonInlinedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt"); doTest(fileName); } @TestMetadata("onlyLocalReturnLambda.kt") public void testOnlyLocalReturnLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt"); doTest(fileName); } @TestMetadata("onlyLocalReturnLambdaBinaryExpr.kt") public void testOnlyLocalReturnLambdaBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt"); doTest(fileName); } @TestMetadata("propertyAccessorsAndConstructor.kt") public void testPropertyAccessorsAndConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.kt"); doTest(fileName); } @TestMetadata("toOnlyLocal.kt") public void testToOnlyLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt"); doTest(fileName); } } @@ -8652,50 +8652,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NonPublicMember extends AbstractJetDiagnosticsTest { + public static class NonPublicMember extends AbstractDiagnosticsTest { public void testAllFilesPresentInNonPublicMember() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonPublicMember"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonPublicMember"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inNonPublicClass.kt") public void testInNonPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt"); doTest(fileName); } @TestMetadata("inNonPublicInnerClass.kt") public void testInNonPublicInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt"); doTest(fileName); } @TestMetadata("inPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt"); doTest(fileName); } @TestMetadata("inPublicClass.kt") public void testInPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.kt"); doTest(fileName); } @TestMetadata("localClass2.kt") public void testLocalClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.kt"); doTest(fileName); } } @@ -8703,14 +8703,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/regressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Regressions extends AbstractJetDiagnosticsTest { + public static class Regressions extends AbstractDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt4341.kt") public void testKt4341() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/regressions/kt4341.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/regressions/kt4341.kt"); doTest(fileName); } } @@ -8718,26 +8718,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnaryExpressions extends AbstractJetDiagnosticsTest { + public static class UnaryExpressions extends AbstractDiagnosticsTest { public void testAllFilesPresentInUnaryExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/unaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/unaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mathOperation.kt") public void testMathOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.kt"); doTest(fileName); } @TestMetadata("notOnCall.kt") public void testNotOnCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.kt"); doTest(fileName); } @TestMetadata("notOperation.kt") public void testNotOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.kt"); doTest(fileName); } } @@ -8746,280 +8746,280 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inner") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inner extends AbstractJetDiagnosticsTest { + public static class Inner extends AbstractDiagnosticsTest { @TestMetadata("accessingToJavaNestedClass.kt") public void testAccessingToJavaNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/accessingToJavaNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/accessingToJavaNestedClass.kt"); doTest(fileName); } @TestMetadata("accessingToKotlinNestedClass.kt") public void testAccessingToKotlinNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/accessingToKotlinNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/accessingToKotlinNestedClass.kt"); doTest(fileName); } public void testAllFilesPresentInInner() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classesInClassObjectHeader.kt") public void testClassesInClassObjectHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt"); doTest(fileName); } @TestMetadata("constructorAccess.kt") public void testConstructorAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/constructorAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/constructorAccess.kt"); doTest(fileName); } @TestMetadata("deepInnerClass.kt") public void testDeepInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/deepInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/deepInnerClass.kt"); doTest(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/enumEntries.kt"); doTest(fileName); } @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionFun.kt"); doTest(fileName); } @TestMetadata("extensionLambdaInsideNestedClass.kt") public void testExtensionLambdaInsideNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt"); doTest(fileName); } @TestMetadata("illegalModifier.kt") public void testIllegalModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/illegalModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/illegalModifier.kt"); doTest(fileName); } @TestMetadata("InnerClassNameClash.kt") public void testInnerClassNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/InnerClassNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/InnerClassNameClash.kt"); doTest(fileName); } @TestMetadata("innerClassesInStaticParameters.kt") public void testInnerClassesInStaticParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt"); doTest(fileName); } @TestMetadata("innerErrorForClassObjects.kt") public void testInnerErrorForClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt"); doTest(fileName); } @TestMetadata("innerErrorForObjects.kt") public void testInnerErrorForObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForObjects.kt"); doTest(fileName); } @TestMetadata("innerThisSuper.kt") public void testInnerThisSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerThisSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerThisSuper.kt"); doTest(fileName); } @TestMetadata("kt5854.kt") public void testKt5854() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/kt5854.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/kt5854.kt"); doTest(fileName); } @TestMetadata("kt6026.kt") public void testKt6026() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/kt6026.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/kt6026.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClass.kt"); doTest(fileName); } @TestMetadata("localClassInsideNested.kt") public void testLocalClassInsideNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClassInsideNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClassInsideNested.kt"); doTest(fileName); } @TestMetadata("localThisSuper.kt") public void testLocalThisSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localThisSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localThisSuper.kt"); doTest(fileName); } @TestMetadata("modality.kt") public void testModality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/modality.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/modality.kt"); doTest(fileName); } @TestMetadata("nestedClassAccessedViaInstanceReference.kt") public void testNestedClassAccessedViaInstanceReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt"); doTest(fileName); } @TestMetadata("nestedClassExtendsOuter.kt") public void testNestedClassExtendsOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.kt"); doTest(fileName); } @TestMetadata("nestedClassExtendsOuterGeneric.kt") public void testNestedClassExtendsOuterGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.kt"); doTest(fileName); } @TestMetadata("nestedClassInObject.kt") public void testNestedClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassInObject.kt"); doTest(fileName); } @TestMetadata("nestedClassNotAllowed.kt") public void testNestedClassNotAllowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt"); doTest(fileName); } @TestMetadata("nestedVsInnerAccessOuterMember.kt") public void testNestedVsInnerAccessOuterMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.kt"); doTest(fileName); } @TestMetadata("outerGenericParam.kt") public void testOuterGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerGenericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerGenericParam.kt"); doTest(fileName); } @TestMetadata("outerProtectedMember.kt") public void testOuterProtectedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt"); doTest(fileName); } @TestMetadata("outerSuperClassMember.kt") public void testOuterSuperClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerSuperClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerSuperClassMember.kt"); doTest(fileName); } @TestMetadata("referenceToSelfInLocal.kt") public void testReferenceToSelfInLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt"); doTest(fileName); } @TestMetadata("resolvePackageClassInObjects.kt") public void testResolvePackageClassInObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt"); doTest(fileName); } @TestMetadata("selfAnnotationForClassObject.kt") public void testSelfAnnotationForClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt"); doTest(fileName); } @TestMetadata("traits.kt") public void testTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/traits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/traits.kt"); doTest(fileName); } @TestMetadata("visibility.kt") public void testVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/visibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/visibility.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class QualifiedExpression extends AbstractJetDiagnosticsTest { + public static class QualifiedExpression extends AbstractDiagnosticsTest { public void testAllFilesPresentInQualifiedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectOfNestedClass.kt") public void testClassObjectOfNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt"); doTest(fileName); } @TestMetadata("constructNestedClass.kt") public void testConstructNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.kt"); doTest(fileName); } @TestMetadata("dataLocalVariable.kt") public void testDataLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.kt"); doTest(fileName); } @TestMetadata("enumConstant.kt") public void testEnumConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.kt"); doTest(fileName); } @TestMetadata("genericNestedClass.kt") public void testGenericNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt"); doTest(fileName); } @TestMetadata("importNestedClass.kt") public void testImportNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.kt"); doTest(fileName); } @TestMetadata("nestedClassInPackage.kt") public void testNestedClassInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.kt"); doTest(fileName); } @TestMetadata("nestedEnumConstant.kt") public void testNestedEnumConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.kt"); doTest(fileName); } @TestMetadata("nestedObjects.kt") public void testNestedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.kt"); doTest(fileName); } @TestMetadata("typePosition.kt") public void testTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.kt"); doTest(fileName); } } @@ -9028,418 +9028,418 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/j+k") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class J_k extends AbstractJetDiagnosticsTest { + public static class J_k extends AbstractDiagnosticsTest { @TestMetadata("accessClassObjectFromJava.kt") public void testAccessClassObjectFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt"); doTest(fileName); } public void testAllFilesPresentInJ_k() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguousSamAdapters.kt") public void testAmbiguousSamAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt"); doTest(fileName); } @TestMetadata("canDeclareIfSamAdapterIsInherited.kt") public void testCanDeclareIfSamAdapterIsInherited() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/canDeclareIfSamAdapterIsInherited.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/canDeclareIfSamAdapterIsInherited.kt"); doTest(fileName); } @TestMetadata("computeIfAbsentConcurrent.kt") public void testComputeIfAbsentConcurrent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/computeIfAbsentConcurrent.kt"); doTest(fileName); } @TestMetadata("enumGetOrdinal.kt") public void testEnumGetOrdinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/enumGetOrdinal.kt"); doTest(fileName); } @TestMetadata("fieldOverridesField.kt") public void testFieldOverridesField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/fieldOverridesField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/fieldOverridesField.kt"); doTest(fileName); } @TestMetadata("fieldOverridesNothing.kt") public void testFieldOverridesNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/fieldOverridesNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/fieldOverridesNothing.kt"); doTest(fileName); } @TestMetadata("finalCollectionSize.kt") public void testFinalCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/finalCollectionSize.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/finalCollectionSize.kt"); doTest(fileName); } @TestMetadata("genericConstructorWithMultipleBounds.kt") public void testGenericConstructorWithMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt"); doTest(fileName); } @TestMetadata("GenericsInSupertypes.kt") public void testGenericsInSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.kt"); doTest(fileName); } @TestMetadata("inheritAbstractSamAdapter.kt") public void testInheritAbstractSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.kt"); doTest(fileName); } @TestMetadata("InheritedGenericFunction.kt") public void testInheritedGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.kt"); doTest(fileName); } @TestMetadata("InnerClassFromJava.kt") public void testInnerClassFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/InnerClassFromJava.kt"); doTest(fileName); } @TestMetadata("innerNestedClassFromJava.kt") public void testInnerNestedClassFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt"); doTest(fileName); } @TestMetadata("invisiblePackagePrivateInheritedMember.kt") public void testInvisiblePackagePrivateInheritedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt"); doTest(fileName); } @TestMetadata("javaStaticImport.kt") public void testJavaStaticImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/javaStaticImport.kt"); doTest(fileName); } @TestMetadata("KJKInheritance.kt") public void testKJKInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritance.kt"); doTest(fileName); } @TestMetadata("KJKInheritanceGeneric.kt") public void testKJKInheritanceGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); doTest(fileName); } @TestMetadata("kt1402.kt") public void testKt1402() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1402.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1402.kt"); doTest(fileName); } @TestMetadata("kt1431.kt") public void testKt1431() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1431.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1431.kt"); doTest(fileName); } @TestMetadata("kt1730_implementCharSequence.kt") public void testKt1730_implementCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1730_implementCharSequence.kt"); doTest(fileName); } @TestMetadata("kt2152.kt") public void testKt2152() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2152.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2152.kt"); doTest(fileName); } @TestMetadata("kt2394.kt") public void testKt2394() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2394.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2394.kt"); doTest(fileName); } @TestMetadata("kt2606.kt") public void testKt2606() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2606.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2606.kt"); doTest(fileName); } @TestMetadata("kt2619.kt") public void testKt2619() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2619.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2619.kt"); doTest(fileName); } @TestMetadata("kt2641.kt") public void testKt2641() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2641.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2641.kt"); doTest(fileName); } @TestMetadata("kt2890.kt") public void testKt2890() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2890.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2890.kt"); doTest(fileName); } @TestMetadata("kt3307.kt") public void testKt3307() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3307.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3307.kt"); doTest(fileName); } @TestMetadata("kt3311.kt") public void testKt3311() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3311.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3311.kt"); doTest(fileName); } @TestMetadata("kt6720_abstractProperty.kt") public void testKt6720_abstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt6720_abstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt6720_abstractProperty.kt"); doTest(fileName); } @TestMetadata("mutableIterator.kt") public void testMutableIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/mutableIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/mutableIterator.kt"); doTest(fileName); } @TestMetadata("overrideRawType.kt") public void testOverrideRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideRawType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideRawType.kt"); doTest(fileName); } @TestMetadata("OverrideVararg.kt") public void testOverrideVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/OverrideVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/OverrideVararg.kt"); doTest(fileName); } @TestMetadata("overrideWithSamAndTypeParameter.kt") public void testOverrideWithSamAndTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideWithSamAndTypeParameter.kt"); doTest(fileName); } @TestMetadata("packagePrivateClassStaticMember.kt") public void testPackagePrivateClassStaticMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt"); doTest(fileName); } @TestMetadata("packageVisibility.kt") public void testPackageVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packageVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packageVisibility.kt"); doTest(fileName); } @TestMetadata("privateFieldOverridesNothing.kt") public void testPrivateFieldOverridesNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/privateFieldOverridesNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/privateFieldOverridesNothing.kt"); doTest(fileName); } @TestMetadata("privateNestedClassStaticMember.kt") public void testPrivateNestedClassStaticMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt"); doTest(fileName); } @TestMetadata("protectedStaticSamePackage.kt") public void testProtectedStaticSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt"); doTest(fileName); } @TestMetadata("recursiveRawUpperBound.kt") public void testRecursiveRawUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.kt"); doTest(fileName); } @TestMetadata("recursiveRawUpperBound2.kt") public void testRecursiveRawUpperBound2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound2.kt"); doTest(fileName); } @TestMetadata("recursiveRawUpperBound3.kt") public void testRecursiveRawUpperBound3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound3.kt"); doTest(fileName); } @TestMetadata("samInConstructorWithGenerics.kt") public void testSamInConstructorWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt"); doTest(fileName); } @TestMetadata("serializable.kt") public void testSerializable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/serializable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/serializable.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/Simple.kt"); doTest(fileName); } @TestMetadata("specialBridges.kt") public void testSpecialBridges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/specialBridges.kt"); doTest(fileName); } @TestMetadata("StaticMembersFromSuperclasses.kt") public void testStaticMembersFromSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.kt"); doTest(fileName); } @TestMetadata("SupertypeArgumentsNullability-NotNull-SpecialTypes.kt") public void testSupertypeArgumentsNullability_NotNull_SpecialTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.kt"); doTest(fileName); } @TestMetadata("SupertypeArgumentsNullability-NotNull-UserTypes.kt") public void testSupertypeArgumentsNullability_NotNull_UserTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.kt"); doTest(fileName); } @TestMetadata("SupertypeArgumentsNullability-SpecialTypes.kt") public void testSupertypeArgumentsNullability_SpecialTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.kt"); doTest(fileName); } @TestMetadata("SupertypeArgumentsNullability-UserTypes.kt") public void testSupertypeArgumentsNullability_UserTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.kt"); doTest(fileName); } @TestMetadata("traitDefaultCall.kt") public void testTraitDefaultCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/traitDefaultCall.kt"); doTest(fileName); } @TestMetadata("UnboxingNulls.kt") public void testUnboxingNulls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CollectionOverrides extends AbstractJetDiagnosticsTest { + public static class CollectionOverrides extends AbstractDiagnosticsTest { public void testAllFilesPresentInCollectionOverrides() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/collectionOverrides"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("commonCollections.kt") public void testCommonCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/commonCollections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/commonCollections.kt"); doTest(fileName); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt"); doTest(fileName); } @TestMetadata("containsAll.kt") public void testContainsAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt"); doTest(fileName); } @TestMetadata("containsAndOverload.kt") public void testContainsAndOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.kt"); doTest(fileName); } @TestMetadata("getCharSequence.kt") public void testGetCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/getCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/getCharSequence.kt"); doTest(fileName); } @TestMetadata("irrelevantImplCharSequence.kt") public void testIrrelevantImplCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplCharSequence.kt"); doTest(fileName); } @TestMetadata("irrelevantImplCharSequenceKotlin.kt") public void testIrrelevantImplCharSequenceKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplCharSequenceKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplCharSequenceKotlin.kt"); doTest(fileName); } @TestMetadata("irrelevantImplMutableList.kt") public void testIrrelevantImplMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.kt"); doTest(fileName); } @TestMetadata("irrelevantImplMutableListKotlin.kt") public void testIrrelevantImplMutableListKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.kt"); doTest(fileName); } @TestMetadata("mapGetOverride.kt") public void testMapGetOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.kt"); doTest(fileName); } @TestMetadata("overridesBuiltinNoMagic.kt") public void testOverridesBuiltinNoMagic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.kt"); doTest(fileName); } @TestMetadata("removeAt.kt") public void testRemoveAt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt"); doTest(fileName); } @TestMetadata("removeAtInt.kt") public void testRemoveAtInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt"); doTest(fileName); } @TestMetadata("sizeFromKotlinOverriddenInJava.kt") public void testSizeFromKotlinOverriddenInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.kt"); doTest(fileName); } } @@ -9447,32 +9447,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/j+k/properties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Properties extends AbstractJetDiagnosticsTest { + public static class Properties extends AbstractDiagnosticsTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("interface.kt") public void testInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/interface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/interface.kt"); doTest(fileName); } @TestMetadata("isName.kt") public void testIsName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/isName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/isName.kt"); doTest(fileName); } @TestMetadata("val.kt") public void testVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/val.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/val.kt"); doTest(fileName); } @TestMetadata("var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/properties/var.kt"); doTest(fileName); } } @@ -9480,38 +9480,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/j+k/types") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Types extends AbstractJetDiagnosticsTest { + public static class Types extends AbstractDiagnosticsTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/j+k/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/arrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/arrayList.kt"); doTest(fileName); } @TestMetadata("returnCollection.kt") public void testReturnCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/returnCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/returnCollection.kt"); doTest(fileName); } @TestMetadata("shapeMismatchInCovariantPosition.kt") public void testShapeMismatchInCovariantPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPosition.kt"); doTest(fileName); } @TestMetadata("shapeMismatchInCovariantPositionGeneric.kt") public void testShapeMismatchInCovariantPositionGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPositionGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/shapeMismatchInCovariantPositionGeneric.kt"); doTest(fileName); } @TestMetadata("typeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/typeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/types/typeParameter.kt"); doTest(fileName); } } @@ -9520,62 +9520,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/java8Overrides") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Java8Overrides extends AbstractJetDiagnosticsTest { + public static class Java8Overrides extends AbstractDiagnosticsTest { @TestMetadata("abstractBaseClassMemberNotImplemented.kt") public void testAbstractBaseClassMemberNotImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/abstractBaseClassMemberNotImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/abstractBaseClassMemberNotImplemented.kt"); doTest(fileName); } @TestMetadata("abstractVsAbstract.kt") public void testAbstractVsAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/abstractVsAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/abstractVsAbstract.kt"); doTest(fileName); } public void testAllFilesPresentInJava8Overrides() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/java8Overrides"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/java8Overrides"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultVsAbstract.kt") public void testDefaultVsAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/defaultVsAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/defaultVsAbstract.kt"); doTest(fileName); } @TestMetadata("hidingMethodOfAny.kt") public void testHidingMethodOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/hidingMethodOfAny.kt"); doTest(fileName); } @TestMetadata("implementingMethodOfAny.kt") public void testImplementingMethodOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/implementingMethodOfAny.kt"); doTest(fileName); } @TestMetadata("notAMethodOfAny.kt") public void testNotAMethodOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/notAMethodOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/notAMethodOfAny.kt"); doTest(fileName); } @TestMetadata("overridingMethodOfAnyChain.kt") public void testOverridingMethodOfAnyChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyChain.kt"); doTest(fileName); } @TestMetadata("overridingMethodOfAnyDiamond.kt") public void testOverridingMethodOfAnyDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/overridingMethodOfAnyDiamond.kt"); doTest(fileName); } @TestMetadata("singleRelevantDefault.kt") public void testSingleRelevantDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/singleRelevantDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/java8Overrides/singleRelevantDefault.kt"); doTest(fileName); } } @@ -9583,68 +9583,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/labels") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Labels extends AbstractJetDiagnosticsTest { + public static class Labels extends AbstractDiagnosticsTest { public void testAllFilesPresentInLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/labels"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/labels"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1703.kt") public void testKt1703() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt1703.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt1703.kt"); doTest(fileName); } @TestMetadata("kt361.kt") public void testKt361() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt361.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt361.kt"); doTest(fileName); } @TestMetadata("kt3920.kt") public void testKt3920() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3920.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3920.kt"); doTest(fileName); } @TestMetadata("kt3988.kt") public void testKt3988() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3988.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3988.kt"); doTest(fileName); } @TestMetadata("kt4247.kt") public void testKt4247() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4247.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4247.kt"); doTest(fileName); } @TestMetadata("kt4586.kt") public void testKt4586() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4586.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4586.kt"); doTest(fileName); } @TestMetadata("kt4603.kt") public void testKt4603() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4603.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4603.kt"); doTest(fileName); } @TestMetadata("kt591.kt") public void testKt591() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt591.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt591.kt"); doTest(fileName); } @TestMetadata("labelReferencesInsideObjectExpressions.kt") public void testLabelReferencesInsideObjectExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.kt"); doTest(fileName); } @TestMetadata("labelsMustBeNamed.kt") public void testLabelsMustBeNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.kt"); doTest(fileName); } } @@ -9652,20 +9652,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/library") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Library extends AbstractJetDiagnosticsTest { + public static class Library extends AbstractDiagnosticsTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Collections.kt") public void testCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/Collections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/Collections.kt"); doTest(fileName); } @TestMetadata("kt828.kt") public void testKt828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/kt828.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/kt828.kt"); doTest(fileName); } } @@ -9673,118 +9673,118 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/modifiers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Modifiers extends AbstractJetDiagnosticsTest { + public static class Modifiers extends AbstractDiagnosticsTest { public void testAllFilesPresentInModifiers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotations.kt") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/annotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/annotations.kt"); doTest(fileName); } @TestMetadata("defaultModifier.kt") public void testDefaultModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/defaultModifier.kt"); doTest(fileName); } @TestMetadata("IllegalModifiers.kt") public void testIllegalModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt"); doTest(fileName); } @TestMetadata("incompatibleVarianceModifiers.kt") public void testIncompatibleVarianceModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/incompatibleVarianceModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/incompatibleVarianceModifiers.kt"); doTest(fileName); } @TestMetadata("inlineParameters.kt") public void testInlineParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/inlineParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/inlineParameters.kt"); doTest(fileName); } @TestMetadata("internalInInterface.kt") public void testInternalInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/internalInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/internalInInterface.kt"); doTest(fileName); } @TestMetadata("modifierOnParameterInFunctionType.kt") public void testModifierOnParameterInFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/modifierOnParameterInFunctionType.kt"); doTest(fileName); } @TestMetadata("NoLocalVisibility.kt") public void testNoLocalVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/NoLocalVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/NoLocalVisibility.kt"); doTest(fileName); } @TestMetadata("primaryConstructorMissingKeyword.kt") public void testPrimaryConstructorMissingKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/primaryConstructorMissingKeyword.kt"); doTest(fileName); } @TestMetadata("privateInInterface.kt") public void testPrivateInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt"); doTest(fileName); } @TestMetadata("protected.kt") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/protected.kt"); doTest(fileName); } @TestMetadata("redundantTargets.kt") public void testRedundantTargets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/redundantTargets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/redundantTargets.kt"); doTest(fileName); } @TestMetadata("repeatedModifiers.kt") public void testRepeatedModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/repeatedModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/repeatedModifiers.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/modifiers/const") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Const extends AbstractJetDiagnosticsTest { + public static class Const extends AbstractDiagnosticsTest { public void testAllFilesPresentInConst() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers/const"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers/const"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("applicability.kt") public void testApplicability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/applicability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/applicability.kt"); doTest(fileName); } @TestMetadata("constInteraction.kt") public void testConstInteraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/constInteraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/constInteraction.kt"); doTest(fileName); } @TestMetadata("fromJava.kt") public void testFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/fromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/fromJava.kt"); doTest(fileName); } @TestMetadata("types.kt") public void testTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/types.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/const/types.kt"); doTest(fileName); } } @@ -9792,26 +9792,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorInfix extends AbstractJetDiagnosticsTest { + public static class OperatorInfix extends AbstractDiagnosticsTest { public void testAllFilesPresentInOperatorInfix() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers/operatorInfix"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/modifiers/operatorInfix"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LocalFunctions.kt") public void testLocalFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/LocalFunctions.kt"); doTest(fileName); } @TestMetadata("MemberFunctions.kt") public void testMemberFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/modifiers/operatorInfix/Simple.kt"); doTest(fileName); } } @@ -9820,112 +9820,112 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Multimodule extends AbstractJetDiagnosticsTest { + public static class Multimodule extends AbstractDiagnosticsTest { public void testAllFilesPresentInMultimodule() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internal.kt") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/internal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/internal.kt"); doTest(fileName); } @TestMetadata("packagePrivate.kt") public void testPackagePrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt"); doTest(fileName); } @TestMetadata("varargConflict.kt") public void testVarargConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/varargConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/varargConflict.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateClass extends AbstractJetDiagnosticsTest { + public static class DuplicateClass extends AbstractDiagnosticsTest { public void testAllFilesPresentInDuplicateClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("collectionMethodStub.kt") public void testCollectionMethodStub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt"); doTest(fileName); } @TestMetadata("differentGenericArguments.kt") public void testDifferentGenericArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.kt"); doTest(fileName); } @TestMetadata("differentGenericArgumentsReversed.kt") public void testDifferentGenericArgumentsReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.kt"); doTest(fileName); } @TestMetadata("duplicateClass.kt") public void testDuplicateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.kt"); doTest(fileName); } @TestMetadata("duplicateNestedClasses.kt") public void testDuplicateNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt"); doTest(fileName); } @TestMetadata("duplicateSuperClass.kt") public void testDuplicateSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.kt"); doTest(fileName); } @TestMetadata("genericArgumentNumberMismatch.kt") public void testGenericArgumentNumberMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.kt"); doTest(fileName); } @TestMetadata("genericSuperClass.kt") public void testGenericSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.kt"); doTest(fileName); } @TestMetadata("inTheSameModuleWithUsage.kt") public void testInTheSameModuleWithUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.kt"); doTest(fileName); } @TestMetadata("inTheSameModuleWithUsageNoTypeAnnotation.kt") public void testInTheSameModuleWithUsageNoTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("members.kt") public void testMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.kt"); doTest(fileName); } @TestMetadata("sameClassNameDifferentPackages.kt") public void testSameClassNameDifferentPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt"); doTest(fileName); } @TestMetadata("sameGenericArguments.kt") public void testSameGenericArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.kt"); doTest(fileName); } } @@ -9933,146 +9933,146 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateMethod extends AbstractJetDiagnosticsTest { + public static class DuplicateMethod extends AbstractDiagnosticsTest { public void testAllFilesPresentInDuplicateMethod() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateMethod"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateMethod"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classGenericsInParams.kt") public void testClassGenericsInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.kt"); doTest(fileName); } @TestMetadata("classGenericsInParamsBoundMismatch.kt") public void testClassGenericsInParamsBoundMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.kt"); doTest(fileName); } @TestMetadata("classGenericsInParamsIndexMismatch.kt") public void testClassGenericsInParamsIndexMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.kt"); doTest(fileName); } @TestMetadata("classGenericsInParamsNameMismatch.kt") public void testClassGenericsInParamsNameMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.kt"); doTest(fileName); } @TestMetadata("classGenericsInReturnType.kt") public void testClassGenericsInReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.kt"); doTest(fileName); } @TestMetadata("classVsFunctionGenericsInParamsMismatch.kt") public void testClassVsFunctionGenericsInParamsMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt"); doTest(fileName); } @TestMetadata("covariantReturnTypes.kt") public void testCovariantReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.kt"); doTest(fileName); } @TestMetadata("differenceInParamNames.kt") public void testDifferenceInParamNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.kt"); doTest(fileName); } @TestMetadata("differentGenericsInParams.kt") public void testDifferentGenericsInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.kt"); doTest(fileName); } @TestMetadata("differentNumberOfParams.kt") public void testDifferentNumberOfParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.kt"); doTest(fileName); } @TestMetadata("differentReturnTypes.kt") public void testDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.kt"); doTest(fileName); } @TestMetadata("extensionMatch.kt") public void testExtensionMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParams.kt") public void testFunctionGenericsInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParamsBoundsMismatch.kt") public void testFunctionGenericsInParamsBoundsMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParamsEqNull.kt") public void testFunctionGenericsInParamsEqNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParamsNotIs.kt") public void testFunctionGenericsInParamsNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParamsReturnFooT.kt") public void testFunctionGenericsInParamsReturnFooT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.kt"); doTest(fileName); } @TestMetadata("functionGenericsInParamsReturnT.kt") public void testFunctionGenericsInParamsReturnT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.kt"); doTest(fileName); } @TestMetadata("noGenericsInParams.kt") public void testNoGenericsInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.kt"); doTest(fileName); } @TestMetadata("noParams.kt") public void testNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.kt"); doTest(fileName); } @TestMetadata("sameGenericsInParams.kt") public void testSameGenericsInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.kt"); doTest(fileName); } @TestMetadata("simpleWithInheritance.kt") public void testSimpleWithInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.kt"); doTest(fileName); } @TestMetadata("substitutedGenericInParams.kt") public void testSubstitutedGenericInParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.kt"); doTest(fileName); } } @@ -10080,32 +10080,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateSuper extends AbstractJetDiagnosticsTest { + public static class DuplicateSuper extends AbstractDiagnosticsTest { public void testAllFilesPresentInDuplicateSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateSuper"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateSuper"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentSuperTraits.kt") public void testDifferentSuperTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.kt"); doTest(fileName); } @TestMetadata("sameSuperTrait.kt") public void testSameSuperTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.kt"); doTest(fileName); } @TestMetadata("sameSuperTraitDifferentBounds.kt") public void testSameSuperTraitDifferentBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.kt"); doTest(fileName); } @TestMetadata("sameSuperTraitGenerics.kt") public void testSameSuperTraitGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.kt"); doTest(fileName); } } @@ -10114,86 +10114,86 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/namedArguments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NamedArguments extends AbstractJetDiagnosticsTest { + public static class NamedArguments extends AbstractDiagnosticsTest { public void testAllFilesPresentInNamedArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("allowForJavaAnnotation.kt") public void testAllowForJavaAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.kt"); doTest(fileName); } @TestMetadata("ambiguousNamedArguments1.kt") public void testAmbiguousNamedArguments1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArguments1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArguments1.kt"); doTest(fileName); } @TestMetadata("ambiguousNamedArguments2.kt") public void testAmbiguousNamedArguments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArguments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArguments2.kt"); doTest(fileName); } @TestMetadata("ambiguousNamedArgumentsWithGenerics1.kt") public void testAmbiguousNamedArgumentsWithGenerics1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics1.kt"); doTest(fileName); } @TestMetadata("ambiguousNamedArgumentsWithGenerics2.kt") public void testAmbiguousNamedArgumentsWithGenerics2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics2.kt"); doTest(fileName); } @TestMetadata("ambiguousNamedArgumentsWithGenerics3.kt") public void testAmbiguousNamedArgumentsWithGenerics3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/ambiguousNamedArgumentsWithGenerics3.kt"); doTest(fileName); } @TestMetadata("disallowForJavaConstructor.kt") public void testDisallowForJavaConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.kt"); doTest(fileName); } @TestMetadata("disallowForJavaMethods.kt") public void testDisallowForJavaMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt"); doTest(fileName); } @TestMetadata("disallowForSamAdapterConstructor.kt") public void testDisallowForSamAdapterConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt"); doTest(fileName); } @TestMetadata("disallowForSamAdapterFunction.kt") public void testDisallowForSamAdapterFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt"); doTest(fileName); } @TestMetadata("namedArgumentsAndDefaultValues.kt") public void testNamedArgumentsAndDefaultValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.kt"); doTest(fileName); } @TestMetadata("namedArgumentsInOverloads.kt") public void testNamedArgumentsInOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsInOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsInOverloads.kt"); doTest(fileName); } @TestMetadata("namedArgumentsInOverrides.kt") public void testNamedArgumentsInOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsInOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsInOverrides.kt"); doTest(fileName); } } @@ -10201,200 +10201,200 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NullabilityAndSmartCasts extends AbstractJetDiagnosticsTest { + public static class NullabilityAndSmartCasts extends AbstractDiagnosticsTest { public void testAllFilesPresentInNullabilityAndSmartCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssertNotNull.kt") public void testAssertNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt"); doTest(fileName); } @TestMetadata("dataFlowInfoAfterExclExcl.kt") public void testDataFlowInfoAfterExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.kt"); doTest(fileName); } @TestMetadata("equalityUnderNotNullCheck.kt") public void testEqualityUnderNotNullCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.kt"); doTest(fileName); } @TestMetadata("funcLiteralArgsInsideAmbiguity.kt") public void testFuncLiteralArgsInsideAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.kt"); doTest(fileName); } @TestMetadata("funcLiteralArgsInsideUnresolvedFunction.kt") public void testFuncLiteralArgsInsideUnresolvedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.kt"); doTest(fileName); } @TestMetadata("InfixCallNullability.kt") public void testInfixCallNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt"); doTest(fileName); } @TestMetadata("kt1270.kt") public void testKt1270() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.kt"); doTest(fileName); } @TestMetadata("kt1680.kt") public void testKt1680() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.kt"); doTest(fileName); } @TestMetadata("kt1778.kt") public void testKt1778() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.kt"); doTest(fileName); } @TestMetadata("kt2109.kt") public void testKt2109() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.kt"); doTest(fileName); } @TestMetadata("kt2125.kt") public void testKt2125() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.kt"); doTest(fileName); } @TestMetadata("kt2146.kt") public void testKt2146() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt"); doTest(fileName); } @TestMetadata("kt2164.kt") public void testKt2164() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt"); doTest(fileName); } @TestMetadata("kt2176.kt") public void testKt2176() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.kt"); doTest(fileName); } @TestMetadata("kt2195.kt") public void testKt2195() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.kt"); doTest(fileName); } @TestMetadata("kt2212.kt") public void testKt2212() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.kt"); doTest(fileName); } @TestMetadata("kt2216.kt") public void testKt2216() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt"); doTest(fileName); } @TestMetadata("kt2223.kt") public void testKt2223() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.kt"); doTest(fileName); } @TestMetadata("kt2234.kt") public void testKt2234() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.kt"); doTest(fileName); } @TestMetadata("kt2336.kt") public void testKt2336() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.kt"); doTest(fileName); } @TestMetadata("kt244.kt") public void testKt244() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.kt"); doTest(fileName); } @TestMetadata("kt362.kt") public void testKt362() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.kt"); doTest(fileName); } @TestMetadata("noSenselessNullOnNullableType.kt") public void testNoSenselessNullOnNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.kt"); doTest(fileName); } @TestMetadata("noUnnecessaryNotNullAssertionOnErrorType.kt") public void testNoUnnecessaryNotNullAssertionOnErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.kt"); doTest(fileName); } @TestMetadata("NullableNothingIsExactlyNull.kt") public void testNullableNothingIsExactlyNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.kt"); doTest(fileName); } @TestMetadata("PreferExtensionsOnNullableReceiver.kt") public void testPreferExtensionsOnNullableReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.kt"); doTest(fileName); } @TestMetadata("QualifiedExpressionNullability.kt") public void testQualifiedExpressionNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.kt"); doTest(fileName); } @TestMetadata("ReceiverNullability.kt") public void testReceiverNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.kt"); doTest(fileName); } @TestMetadata("SenselessNullInWhen.kt") public void testSenselessNullInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.kt"); doTest(fileName); } @TestMetadata("senslessComparisonWithNullOnTypeParameters.kt") public void testSenslessComparisonWithNullOnTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.kt"); doTest(fileName); } @TestMetadata("smartCastReceiverWithGenerics.kt") public void testSmartCastReceiverWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.kt"); doTest(fileName); } @TestMetadata("smartCastsAndBooleanExpressions.kt") public void testSmartCastsAndBooleanExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.kt"); doTest(fileName); } } @@ -10402,68 +10402,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/nullableTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NullableTypes extends AbstractJetDiagnosticsTest { + public static class NullableTypes extends AbstractDiagnosticsTest { public void testAllFilesPresentInNullableTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullableTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullableTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("baseWithNullableUpperBound.kt") public void testBaseWithNullableUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.kt"); doTest(fileName); } @TestMetadata("elvisOnUnit.kt") public void testElvisOnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/elvisOnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/elvisOnUnit.kt"); doTest(fileName); } @TestMetadata("nullAssertOnTypeWithNullableUpperBound.kt") public void testNullAssertOnTypeWithNullableUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt"); doTest(fileName); } @TestMetadata("nullableArgumentForIn.kt") public void testNullableArgumentForIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.kt"); doTest(fileName); } @TestMetadata("redundantNullable.kt") public void testRedundantNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.kt"); doTest(fileName); } @TestMetadata("redundantNullableInSupertype.kt") public void testRedundantNullableInSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.kt"); doTest(fileName); } @TestMetadata("safeAccessOnUnit.kt") public void testSafeAccessOnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeAccessOnUnit.kt"); doTest(fileName); } @TestMetadata("safeCallOnTypeWithNullableUpperBound.kt") public void testSafeCallOnTypeWithNullableUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt"); doTest(fileName); } @TestMetadata("safeCallWithInvoke.kt") public void testSafeCallWithInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.kt"); doTest(fileName); } @TestMetadata("uselessElvis.kt") public void testUselessElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt"); doTest(fileName); } } @@ -10471,32 +10471,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/numbers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Numbers extends AbstractJetDiagnosticsTest { + public static class Numbers extends AbstractDiagnosticsTest { public void testAllFilesPresentInNumbers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/numbers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/numbers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("characterIsNotANumber.kt") public void testCharacterIsNotANumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt"); doTest(fileName); } @TestMetadata("doublesInSimpleConstraints.kt") public void testDoublesInSimpleConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt"); doTest(fileName); } @TestMetadata("intValuesOutOfRange.kt") public void testIntValuesOutOfRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt"); doTest(fileName); } @TestMetadata("numbersInSimpleConstraints.kt") public void testNumbersInSimpleConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt"); doTest(fileName); } } @@ -10504,80 +10504,80 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/objects") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Objects extends AbstractJetDiagnosticsTest { + public static class Objects extends AbstractDiagnosticsTest { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/objects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/objects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("invokeOnInnerObject.kt") public void testInvokeOnInnerObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt"); doTest(fileName); } @TestMetadata("kt2240.kt") public void testKt2240() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt2240.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt2240.kt"); doTest(fileName); } @TestMetadata("kt5527.kt") public void testKt5527() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt5527.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt5527.kt"); doTest(fileName); } @TestMetadata("localObjectInsideObject.kt") public void testLocalObjectInsideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjectInsideObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjectInsideObject.kt"); doTest(fileName); } @TestMetadata("localObjects.kt") public void testLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjects.kt"); doTest(fileName); } @TestMetadata("objectInsideFun.kt") public void testObjectInsideFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectInsideFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectInsideFun.kt"); doTest(fileName); } @TestMetadata("objectLiteralExpressionTypeMismatch.kt") public void testObjectLiteralExpressionTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.kt"); doTest(fileName); } @TestMetadata("Objects.kt") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/Objects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/Objects.kt"); doTest(fileName); } @TestMetadata("ObjectsInheritance.kt") public void testObjectsInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsInheritance.kt"); doTest(fileName); } @TestMetadata("ObjectsLocal.kt") public void testObjectsLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsLocal.kt"); doTest(fileName); } @TestMetadata("ObjectsNested.kt") public void testObjectsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsNested.kt"); doTest(fileName); } @TestMetadata("upperBoundViolated.kt") public void testUpperBoundViolated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt"); doTest(fileName); } } @@ -10585,68 +10585,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OperatorsOverloading extends AbstractJetDiagnosticsTest { + public static class OperatorsOverloading extends AbstractDiagnosticsTest { public void testAllFilesPresentInOperatorsOverloading() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/operatorsOverloading"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/operatorsOverloading"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssignOperatorAmbiguity.kt") public void testAssignOperatorAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.kt"); doTest(fileName); } @TestMetadata("AssignmentOperations.kt") public void testAssignmentOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.kt"); doTest(fileName); } @TestMetadata("assignmentOperationsCheckReturnType.kt") public void testAssignmentOperationsCheckReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.kt"); doTest(fileName); } @TestMetadata("compareToNullable.kt") public void testCompareToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/compareToNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/compareToNullable.kt"); doTest(fileName); } @TestMetadata("IteratorAmbiguity.kt") public void testIteratorAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt"); doTest(fileName); } @TestMetadata("kt1028.kt") public void testKt1028() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.kt"); doTest(fileName); } @TestMetadata("kt3450.kt") public void testKt3450() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.kt"); doTest(fileName); } @TestMetadata("plusAssignOnArray.kt") public void testPlusAssignOnArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnArray.kt"); doTest(fileName); } @TestMetadata("plusAssignOnLocal.kt") public void testPlusAssignOnLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnLocal.kt"); doTest(fileName); } @TestMetadata("plusAssignOnProperty.kt") public void testPlusAssignOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/plusAssignOnProperty.kt"); doTest(fileName); } } @@ -10654,128 +10654,128 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/overload") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Overload extends AbstractJetDiagnosticsTest { + public static class Overload extends AbstractDiagnosticsTest { public void testAllFilesPresentInOverload() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt") public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt") public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt") public void testConflictingOverloadsIdenticalFunsInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt") public void testConflictingOverloadsIdenticalFunsTPInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt") public void testConflictingOverloadsIdenticalValsInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.kt"); doTest(fileName); } @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt") public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.kt"); doTest(fileName); } @TestMetadata("ConstructorVsFunOverload.kt") public void testConstructorVsFunOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt"); doTest(fileName); } @TestMetadata("defaultParameters.kt") public void testDefaultParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/defaultParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/defaultParameters.kt"); doTest(fileName); } @TestMetadata("EmptyArgumentListInLambda.kt") public void testEmptyArgumentListInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/EmptyArgumentListInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/EmptyArgumentListInLambda.kt"); doTest(fileName); } @TestMetadata("ExtFunDifferentReceiver.kt") public void testExtFunDifferentReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.kt"); doTest(fileName); } @TestMetadata("FunNoConflictInDifferentPackages.kt") public void testFunNoConflictInDifferentPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.kt"); doTest(fileName); } @TestMetadata("kt1998.kt") public void testKt1998() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt1998.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt1998.kt"); doTest(fileName); } @TestMetadata("kt2493.kt") public void testKt2493() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt2493.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt2493.kt"); doTest(fileName); } @TestMetadata("kt7068.kt") public void testKt7068() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt7068.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt7068.kt"); doTest(fileName); } @TestMetadata("kt7068_2.kt") public void testKt7068_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt7068_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt7068_2.kt"); doTest(fileName); } @TestMetadata("OverloadFunRegularAndExt.kt") public void testOverloadFunRegularAndExt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.kt"); doTest(fileName); } @TestMetadata("OverloadVarAndFunInClass.kt") public void testOverloadVarAndFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.kt"); doTest(fileName); } @TestMetadata("SyntheticAndNotSynthetic.kt") public void testSyntheticAndNotSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.kt"); doTest(fileName); } @TestMetadata("TypeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/TypeParameterMultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/TypeParameterMultipleBounds.kt"); doTest(fileName); } } @@ -10783,334 +10783,334 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/override") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Override extends AbstractJetDiagnosticsTest { + public static class Override extends AbstractDiagnosticsTest { @TestMetadata("AbstractFunImplemented.kt") public void testAbstractFunImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt"); doTest(fileName); } @TestMetadata("AbstractFunNotImplemented.kt") public void testAbstractFunNotImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.kt"); doTest(fileName); } @TestMetadata("AbstractValImplemented.kt") public void testAbstractValImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValImplemented.kt"); doTest(fileName); } @TestMetadata("AbstractValNotImplemented.kt") public void testAbstractValNotImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.kt"); doTest(fileName); } @TestMetadata("AbstractVarImplemented.kt") public void testAbstractVarImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarImplemented.kt"); doTest(fileName); } @TestMetadata("AbstractVarNotImplemented.kt") public void testAbstractVarNotImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt"); doTest(fileName); } public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AllPrivateFromSuperTypes.kt") public void testAllPrivateFromSuperTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt"); doTest(fileName); } @TestMetadata("ComplexValRedeclaration.kt") public void testComplexValRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt"); doTest(fileName); } @TestMetadata("ConflictingFunctionSignatureFromSuperclass.kt") public void testConflictingFunctionSignatureFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.kt"); doTest(fileName); } @TestMetadata("ConflictingPropertySignatureFromSuperclass.kt") public void testConflictingPropertySignatureFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt"); doTest(fileName); } @TestMetadata("DefaultParameterValueInOverride.kt") public void testDefaultParameterValueInOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.kt"); doTest(fileName); } @TestMetadata("DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt") public void testDefaultParameterValues_NoErrorsWhenInheritingFromOneTypeTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Delegation.kt"); doTest(fileName); } @TestMetadata("DelegationFun.kt") public void testDelegationFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationFun.kt"); doTest(fileName); } @TestMetadata("DelegationVal.kt") public void testDelegationVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVal.kt"); doTest(fileName); } @TestMetadata("DelegationVar.kt") public void testDelegationVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVar.kt"); doTest(fileName); } @TestMetadata("DuplicateMethod.kt") public void testDuplicateMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DuplicateMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DuplicateMethod.kt"); doTest(fileName); } @TestMetadata("EqualityOfIntersectionTypes.kt") public void testEqualityOfIntersectionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.kt"); doTest(fileName); } @TestMetadata("ExtendFunctionClass.kt") public void testExtendFunctionClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ExtendFunctionClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ExtendFunctionClass.kt"); doTest(fileName); } @TestMetadata("FakeOverrideAbstractAndNonAbstractFun.kt") public void testFakeOverrideAbstractAndNonAbstractFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.kt"); doTest(fileName); } @TestMetadata("FakeOverrideDifferentDeclarationSignatures.kt") public void testFakeOverrideDifferentDeclarationSignatures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.kt"); doTest(fileName); } @TestMetadata("Generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Generics.kt"); doTest(fileName); } @TestMetadata("InvisiblePotentialOverride.kt") public void testInvisiblePotentialOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.kt"); doTest(fileName); } @TestMetadata("kt1862.kt") public void testKt1862() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt1862.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt1862.kt"); doTest(fileName); } @TestMetadata("kt2052.kt") public void testKt2052() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2052.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2052.kt"); doTest(fileName); } @TestMetadata("kt2491.kt") public void testKt2491() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2491.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2491.kt"); doTest(fileName); } @TestMetadata("kt4763.kt") public void testKt4763() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763.kt"); doTest(fileName); } @TestMetadata("kt4763property.kt") public void testKt4763property() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763property.kt"); doTest(fileName); } @TestMetadata("kt4785.kt") public void testKt4785() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4785.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4785.kt"); doTest(fileName); } @TestMetadata("kt880.kt") public void testKt880() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt880.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt880.kt"); doTest(fileName); } @TestMetadata("MissingDelegate.kt") public void testMissingDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MissingDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MissingDelegate.kt"); doTest(fileName); } @TestMetadata("MultipleDefaultParametersInSupertypes.kt") public void testMultipleDefaultParametersInSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.kt"); doTest(fileName); } @TestMetadata("MultipleDefaultParametersInSupertypesNoOverride.kt") public void testMultipleDefaultParametersInSupertypesNoOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt"); doTest(fileName); } @TestMetadata("MultipleDefaultsAndNamesInSupertypes.kt") public void testMultipleDefaultsAndNamesInSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt"); doTest(fileName); } @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt") public void testMultipleDefaultsInSupertypesNoExplicitOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.kt"); doTest(fileName); } @TestMetadata("NonGenerics.kt") public void testNonGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/NonGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/NonGenerics.kt"); doTest(fileName); } @TestMetadata("ObjectDelegationManyImpl.kt") public void testObjectDelegationManyImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.kt"); doTest(fileName); } @TestMetadata("OverrideWithErrors.kt") public void testOverrideWithErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/OverrideWithErrors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/OverrideWithErrors.kt"); doTest(fileName); } @TestMetadata("OverridingFinalMember.kt") public void testOverridingFinalMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/OverridingFinalMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/OverridingFinalMember.kt"); doTest(fileName); } @TestMetadata("ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt") public void testParameterDefaultValues_DefaultValueFromOnlyOneSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt"); doTest(fileName); } @TestMetadata("ParentInheritsManyImplementations.kt") public void testParentInheritsManyImplementations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/PropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/PropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("ProtectedAndPrivateFromSupertypes.kt") public void testProtectedAndPrivateFromSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt"); doTest(fileName); } @TestMetadata("SuspiciousCase1.kt") public void testSuspiciousCase1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/SuspiciousCase1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/SuspiciousCase1.kt"); doTest(fileName); } @TestMetadata("ToAbstractMembersFromSuper-kt1996.kt") public void testToAbstractMembersFromSuper_kt1996() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/override/parameterNames") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterNames extends AbstractJetDiagnosticsTest { + public static class ParameterNames extends AbstractDiagnosticsTest { public void testAllFilesPresentInParameterNames() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/parameterNames"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/parameterNames"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("changeOnOverrideDiagnostic.kt") public void testChangeOnOverrideDiagnostic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.kt"); doTest(fileName); } @TestMetadata("differentNamesInSupertypesDiagnostic.kt") public void testDifferentNamesInSupertypesDiagnostic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.kt"); doTest(fileName); } @TestMetadata("invokeInFunctionClass.kt") public void testInvokeInFunctionClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/invokeInFunctionClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/invokeInFunctionClass.kt"); doTest(fileName); } @TestMetadata("jjkHierarchy.kt") public void testJjkHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.kt"); doTest(fileName); } @TestMetadata("kjkHierarchy.kt") public void testKjkHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.kt"); doTest(fileName); } @TestMetadata("kjkWithSeveralSupers.kt") public void testKjkWithSeveralSupers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.kt"); doTest(fileName); } @TestMetadata("kotlinInheritsBothJavaAndKotlin.kt") public void testKotlinInheritsBothJavaAndKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.kt"); doTest(fileName); } @TestMetadata("kotlinInheritsJava.kt") public void testKotlinInheritsJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.kt"); doTest(fileName); } } @@ -11118,32 +11118,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/override/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameters extends AbstractJetDiagnosticsTest { + public static class TypeParameters extends AbstractDiagnosticsTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classAndTwoInterfaceBounds.kt") public void testClassAndTwoInterfaceBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/classAndTwoInterfaceBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/classAndTwoInterfaceBounds.kt"); doTest(fileName); } @TestMetadata("differentSetsOfBounds.kt") public void testDifferentSetsOfBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/differentSetsOfBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/differentSetsOfBounds.kt"); doTest(fileName); } @TestMetadata("kt9850.kt") public void testKt9850() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/kt9850.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/kt9850.kt"); doTest(fileName); } @TestMetadata("simpleVisitorTwoAccepts.kt") public void testSimpleVisitorTwoAccepts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/simpleVisitorTwoAccepts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/typeParameters/simpleVisitorTwoAccepts.kt"); doTest(fileName); } } @@ -11152,154 +11152,154 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypes extends AbstractJetDiagnosticsTest { + public static class PlatformTypes extends AbstractDiagnosticsTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dereference.kt") public void testDereference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/dereference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/dereference.kt"); doTest(fileName); } @TestMetadata("elvis.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/elvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/elvis.kt"); doTest(fileName); } @TestMetadata("explicitFlexibleNoPackage.kt") public void testExplicitFlexibleNoPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.kt"); doTest(fileName); } @TestMetadata("explicitFlexibleWithPackage.kt") public void testExplicitFlexibleWithPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.kt"); doTest(fileName); } @TestMetadata("getParentOfType.kt") public void testGetParentOfType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/getParentOfType.kt"); doTest(fileName); } @TestMetadata("inference.kt") public void testInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/inference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/inference.kt"); doTest(fileName); } @TestMetadata("intVsIntegerAmbiguity.kt") public void testIntVsIntegerAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.kt"); doTest(fileName); } @TestMetadata("methodTypeParameterDefaultBound.kt") public void testMethodTypeParameterDefaultBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodTypeParameterDefaultBound.kt"); doTest(fileName); } @TestMetadata("nullableTypeArgument.kt") public void testNullableTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.kt"); doTest(fileName); } @TestMetadata("override.kt") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/override.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/override.kt"); doTest(fileName); } @TestMetadata("safeCall.kt") public void testSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/safeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/safeCall.kt"); doTest(fileName); } @TestMetadata("samAdapterInConstructor.kt") public void testSamAdapterInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/samAdapterInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/samAdapterInConstructor.kt"); doTest(fileName); } @TestMetadata("samConstructor.kt") public void testSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/samConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/samConstructor.kt"); doTest(fileName); } @TestMetadata("supertypeArgumentsExplicit.kt") public void testSupertypeArgumentsExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.kt"); doTest(fileName); } @TestMetadata("supertypeTypeArguments.kt") public void testSupertypeTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CommonSupertype extends AbstractJetDiagnosticsTest { + public static class CommonSupertype extends AbstractDiagnosticsTest { public void testAllFilesPresentInCommonSupertype() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/commonSupertype"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/commonSupertype"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("collectionOrNull.kt") public void testCollectionOrNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.kt"); doTest(fileName); } @TestMetadata("inferenceWithBound.kt") public void testInferenceWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.kt"); doTest(fileName); } @TestMetadata("mixedElvis.kt") public void testMixedElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.kt"); doTest(fileName); } @TestMetadata("mixedIf.kt") public void testMixedIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.kt"); doTest(fileName); } @TestMetadata("recursiveGeneric.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.kt"); doTest(fileName); } @TestMetadata("stringOrNull.kt") public void testStringOrNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.kt"); doTest(fileName); } @TestMetadata("typeOfElvis.kt") public void testTypeOfElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.kt"); doTest(fileName); } @TestMetadata("withNothing.kt") public void testWithNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt"); doTest(fileName); } } @@ -11307,56 +11307,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class GenericVarianceViolation extends AbstractJetDiagnosticsTest { + public static class GenericVarianceViolation extends AbstractDiagnosticsTest { public void testAllFilesPresentInGenericVarianceViolation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("listSuperType.kt") public void testListSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.kt"); doTest(fileName); } @TestMetadata("rawTypes.kt") public void testRawTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.kt"); doTest(fileName); } @TestMetadata("smartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.kt"); doTest(fileName); } @TestMetadata("strangeVariance.kt") public void testStrangeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.kt"); doTest(fileName); } @TestMetadata("userDefinedOut.kt") public void testUserDefinedOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/userDefinedOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/userDefinedOut.kt"); doTest(fileName); } @TestMetadata("valueFromJava.kt") public void testValueFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.kt"); doTest(fileName); } @TestMetadata("wildcards.kt") public void testWildcards() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.kt"); doTest(fileName); } } @@ -11364,14 +11364,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/intersection") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Intersection extends AbstractJetDiagnosticsTest { + public static class Intersection extends AbstractDiagnosticsTest { public void testAllFilesPresentInIntersection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/intersection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/intersection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("map.kt") public void testMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/intersection/map.kt"); doTest(fileName); } } @@ -11379,110 +11379,110 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MethodCall extends AbstractJetDiagnosticsTest { + public static class MethodCall extends AbstractDiagnosticsTest { public void testAllFilesPresentInMethodCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/methodCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/methodCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("entrySet.kt") public void testEntrySet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.kt"); doTest(fileName); } @TestMetadata("genericsAndArrays.kt") public void testGenericsAndArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.kt"); doTest(fileName); } @TestMetadata("int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/int.kt"); doTest(fileName); } @TestMetadata("intArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.kt"); doTest(fileName); } @TestMetadata("javaCollectionToKotlin.kt") public void testJavaCollectionToKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.kt"); doTest(fileName); } @TestMetadata("javaToJava.kt") public void testJavaToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.kt"); doTest(fileName); } @TestMetadata("javaToKotlin.kt") public void testJavaToKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.kt"); doTest(fileName); } @TestMetadata("kotlinCollectionToJava.kt") public void testKotlinCollectionToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.kt"); doTest(fileName); } @TestMetadata("list.kt") public void testList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/list.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/list.kt"); doTest(fileName); } @TestMetadata("multipleExactBounds.kt") public void testMultipleExactBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.kt"); doTest(fileName); } @TestMetadata("multipleExactBoundsNullable.kt") public void testMultipleExactBoundsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.kt"); doTest(fileName); } @TestMetadata("objectArray.kt") public void testObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.kt"); doTest(fileName); } @TestMetadata("overloadingForSubclass.kt") public void testOverloadingForSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.kt"); doTest(fileName); } @TestMetadata("sam.kt") public void testSam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.kt"); doTest(fileName); } @TestMetadata("singleton.kt") public void testSingleton() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt"); doTest(fileName); } @TestMetadata("string.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/string.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/string.kt"); doTest(fileName); } @TestMetadata("visitor.kt") public void testVisitor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt"); doTest(fileName); } } @@ -11490,182 +11490,182 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NullabilityWarnings extends AbstractJetDiagnosticsTest { + public static class NullabilityWarnings extends AbstractDiagnosticsTest { public void testAllFilesPresentInNullabilityWarnings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arithmetic.kt") public void testArithmetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt"); doTest(fileName); } @TestMetadata("array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/array.kt"); doTest(fileName); } @TestMetadata("assignToVar.kt") public void testAssignToVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt"); doTest(fileName); } @TestMetadata("conditions.kt") public void testConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt"); doTest(fileName); } @TestMetadata("dataFlowInfo.kt") public void testDataFlowInfo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt"); doTest(fileName); } @TestMetadata("defaultParameters.kt") public void testDefaultParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt"); doTest(fileName); } @TestMetadata("delegatedProperties.kt") public void testDelegatedProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegatedProperties.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt"); doTest(fileName); } @TestMetadata("derefenceExtension.kt") public void testDerefenceExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceExtension.kt"); doTest(fileName); } @TestMetadata("derefenceMember.kt") public void testDerefenceMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/derefenceMember.kt"); doTest(fileName); } @TestMetadata("elvis.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.kt"); doTest(fileName); } @TestMetadata("expectedType.kt") public void testExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/expectedType.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.kt"); doTest(fileName); } @TestMetadata("functionArguments.kt") public void testFunctionArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/functionArguments.kt"); doTest(fileName); } @TestMetadata("inferenceInConditionals.kt") public void testInferenceInConditionals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/invoke.kt"); doTest(fileName); } @TestMetadata("kt6829.kt") public void testKt6829() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("notNullAfterSafeCall.kt") public void testNotNullAfterSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAfterSafeCall.kt"); doTest(fileName); } @TestMetadata("notNullAssertion.kt") public void testNotNullAssertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertion.kt"); doTest(fileName); } @TestMetadata("notNullAssertionInCall.kt") public void testNotNullAssertionInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullAssertionInCall.kt"); doTest(fileName); } @TestMetadata("notNullTypeMarkedWithNullableAnnotation.kt") public void testNotNullTypeMarkedWithNullableAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.kt"); doTest(fileName); } @TestMetadata("passToJava.kt") public void testPassToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt"); doTest(fileName); } @TestMetadata("primitiveArray.kt") public void testPrimitiveArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/primitiveArray.kt"); doTest(fileName); } @TestMetadata("safeCall.kt") public void testSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/safeCall.kt"); doTest(fileName); } @TestMetadata("senselessComparisonEquals.kt") public void testSenselessComparisonEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonEquals.kt"); doTest(fileName); } @TestMetadata("senselessComparisonIdentityEquals.kt") public void testSenselessComparisonIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/senselessComparisonIdentityEquals.kt"); doTest(fileName); } @TestMetadata("throw.kt") public void testThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt"); doTest(fileName); } @TestMetadata("uselessElvisInCall.kt") public void testUselessElvisInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/uselessElvisInCall.kt"); doTest(fileName); } } @@ -11673,92 +11673,92 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RawTypes extends AbstractJetDiagnosticsTest { + public static class RawTypes extends AbstractDiagnosticsTest { public void testAllFilesPresentInRawTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/rawTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/rawTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrays.kt") public void testArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt"); doTest(fileName); } @TestMetadata("genericInnerClass.kt") public void testGenericInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.kt"); doTest(fileName); } @TestMetadata("nonGenericRawMember.kt") public void testNonGenericRawMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt"); doTest(fileName); } @TestMetadata("nonTrivialErasure.kt") public void testNonTrivialErasure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.kt"); doTest(fileName); } @TestMetadata("rawSupertype.kt") public void testRawSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.kt"); doTest(fileName); } @TestMetadata("rawSupertypeOverride.kt") public void testRawSupertypeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.kt"); doTest(fileName); } @TestMetadata("rawTypeInUpperBound.kt") public void testRawTypeInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.kt"); doTest(fileName); } @TestMetadata("rawWithInProjection.kt") public void testRawWithInProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawWithInProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawWithInProjection.kt"); doTest(fileName); } @TestMetadata("recursiveBound.kt") public void testRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/recursiveBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/recursiveBound.kt"); doTest(fileName); } @TestMetadata("samRaw.kt") public void testSamRaw() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt"); doTest(fileName); } @TestMetadata("saveRawCapabilitiesAfterSubtitution.kt") public void testSaveRawCapabilitiesAfterSubtitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.kt"); doTest(fileName); } @TestMetadata("starProjectionToRaw.kt") public void testStarProjectionToRaw() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/starProjectionToRaw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/starProjectionToRaw.kt"); doTest(fileName); } @TestMetadata("typeEnhancement.kt") public void testTypeEnhancement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.kt"); doTest(fileName); } } @@ -11766,56 +11766,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeEnhancement extends AbstractJetDiagnosticsTest { + public static class TypeEnhancement extends AbstractDiagnosticsTest { public void testAllFilesPresentInTypeEnhancement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotatedTypeArguments.kt") public void testAnnotatedTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/annotatedTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/annotatedTypeArguments.kt"); doTest(fileName); } @TestMetadata("methodWithTypeParameter.kt") public void testMethodWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/methodWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/methodWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("overriddenExtensions.kt") public void testOverriddenExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/overriddenExtensions.kt"); doTest(fileName); } @TestMetadata("returnTypeDifferentConstructor.kt") public void testReturnTypeDifferentConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeDifferentConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeDifferentConstructor.kt"); doTest(fileName); } @TestMetadata("returnTypeOverrideInKotlin.kt") public void testReturnTypeOverrideInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/returnTypeOverrideInKotlin.kt"); doTest(fileName); } @TestMetadata("saveAnnotationAfterSubstitution.kt") public void testSaveAnnotationAfterSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.kt"); doTest(fileName); } @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentParameterNullability.kt"); doTest(fileName); } @TestMetadata("supertypeDifferentReturnNullability.kt") public void testSupertypeDifferentReturnNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/supertypeDifferentReturnNullability.kt"); doTest(fileName); } } @@ -11824,14 +11824,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/privateInFile") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateInFile extends AbstractJetDiagnosticsTest { + public static class PrivateInFile extends AbstractDiagnosticsTest { public void testAllFilesPresentInPrivateInFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/privateInFile"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/privateInFile"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("visibility.kt") public void testVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/privateInFile/visibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/privateInFile/visibility.kt"); doTest(fileName); } } @@ -11839,50 +11839,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/qualifiedExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class QualifiedExpression extends AbstractJetDiagnosticsTest { + public static class QualifiedExpression extends AbstractDiagnosticsTest { public void testAllFilesPresentInQualifiedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("GenericClassVsPackage.kt") public void testGenericClassVsPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.kt"); doTest(fileName); } @TestMetadata("PackageKeyword.kt") public void testPackageKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageKeyword.kt"); doTest(fileName); } @TestMetadata("PackageVsClass.kt") public void testPackageVsClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.kt"); doTest(fileName); } @TestMetadata("PackageVsClass2.kt") public void testPackageVsClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.kt"); doTest(fileName); } @TestMetadata("PackageVsRootClass.kt") public void testPackageVsRootClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.kt"); doTest(fileName); } @TestMetadata("TypeWithError.kt") public void testTypeWithError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt"); doTest(fileName); } @TestMetadata("visibleClassVsQualifiedClass.kt") public void testVisibleClassVsQualifiedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.kt"); doTest(fileName); } } @@ -11890,62 +11890,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/reassignment") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Reassignment extends AbstractJetDiagnosticsTest { + public static class Reassignment extends AbstractDiagnosticsTest { @TestMetadata("afterfor.kt") public void testAfterfor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/afterfor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/afterfor.kt"); doTest(fileName); } public void testAllFilesPresentInReassignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/reassignment"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/reassignment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dowhile.kt") public void testDowhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/dowhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/dowhile.kt"); doTest(fileName); } @TestMetadata("else.kt") public void testElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/else.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/else.kt"); doTest(fileName); } @TestMetadata("foronly.kt") public void testForonly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/foronly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/foronly.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/if.kt"); doTest(fileName); } @TestMetadata("ifelse.kt") public void testIfelse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/ifelse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/ifelse.kt"); doTest(fileName); } @TestMetadata("noifelse.kt") public void testNoifelse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/noifelse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/noifelse.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/when.kt"); doTest(fileName); } @TestMetadata("whiletrue.kt") public void testWhiletrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/whiletrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reassignment/whiletrue.kt"); doTest(fileName); } } @@ -11953,38 +11953,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/recovery") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Recovery extends AbstractJetDiagnosticsTest { + public static class Recovery extends AbstractDiagnosticsTest { @TestMetadata("absentLeftHandSide.kt") public void testAbsentLeftHandSide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt"); doTest(fileName); } public void testAllFilesPresentInRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/recovery"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/recovery"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyTypeArgs.kt") public void testEmptyTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/emptyTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/emptyTypeArgs.kt"); doTest(fileName); } @TestMetadata("namelessInJava.kt") public void testNamelessInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessInJava.kt"); doTest(fileName); } @TestMetadata("namelessMembers.kt") public void testNamelessMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessMembers.kt"); doTest(fileName); } @TestMetadata("namelessToplevelDeclarations.kt") public void testNamelessToplevelDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.kt"); doTest(fileName); } } @@ -11992,128 +11992,128 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/redeclarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Redeclarations extends AbstractJetDiagnosticsTest { + public static class Redeclarations extends AbstractDiagnosticsTest { public void testAllFilesPresentInRedeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/redeclarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/redeclarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassRedeclarationInDifferentFiles.kt") public void testClassRedeclarationInDifferentFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.kt"); doTest(fileName); } @TestMetadata("ConflictingExtensionProperties.kt") public void testConflictingExtensionProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.kt"); doTest(fileName); } @TestMetadata("kt2418.kt") public void testKt2418() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt"); doTest(fileName); } @TestMetadata("kt2438.kt") public void testKt2438() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2438.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2438.kt"); doTest(fileName); } @TestMetadata("kt470.kt") public void testKt470() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt470.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt470.kt"); doTest(fileName); } @TestMetadata("MultiFilePackageRedeclaration.kt") public void testMultiFilePackageRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt"); doTest(fileName); } @TestMetadata("NoRedeclarationForClassesInDefaultObject.kt") public void testNoRedeclarationForClassesInDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForClassesInDefaultObject.kt"); doTest(fileName); } @TestMetadata("NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt") public void testNoRedeclarationForEnumEntriesAndDefaultObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/NoRedeclarationForEnumEntriesAndDefaultObjectMembers.kt"); doTest(fileName); } @TestMetadata("PropertyAndFunInClass.kt") public void testPropertyAndFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt"); doTest(fileName); } @TestMetadata("PropertyAndInnerClass.kt") public void testPropertyAndInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt"); doTest(fileName); } @TestMetadata("RedeclarationInDefaultObject.kt") public void testRedeclarationInDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInDefaultObject.kt"); doTest(fileName); } @TestMetadata("RedeclarationInMultiFile.kt") public void testRedeclarationInMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt"); doTest(fileName); } @TestMetadata("RedeclarationMainInFile.kt") public void testRedeclarationMainInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInFile.kt"); doTest(fileName); } @TestMetadata("RedeclarationMainInMultiFile.kt") public void testRedeclarationMainInMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationMainInMultiFile.kt"); doTest(fileName); } @TestMetadata("Redeclarations.kt") public void testRedeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt"); doTest(fileName); } @TestMetadata("RedeclarationsInObjects.kt") public void testRedeclarationsInObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt"); doTest(fileName); } @TestMetadata("RedeclaredTypeParameters.kt") public void testRedeclaredTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt"); doTest(fileName); } @TestMetadata("RedeclaringPrivateToFile.kt") public void testRedeclaringPrivateToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.kt"); doTest(fileName); } @TestMetadata("SingletonAndFunctionSameName.kt") public void testSingletonAndFunctionSameName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt"); doTest(fileName); } @TestMetadata("typeParameterWithTwoBounds.kt") public void testTypeParameterWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/typeParameterWithTwoBounds.kt"); doTest(fileName); } } @@ -12121,14 +12121,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/reflection") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Reflection extends AbstractJetDiagnosticsTest { + public static class Reflection extends AbstractDiagnosticsTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/reflection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("noReflectionInClassPath.kt") public void testNoReflectionInClassPath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.kt"); doTest(fileName); } } @@ -12136,754 +12136,754 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/regressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Regressions extends AbstractJetDiagnosticsTest { + public static class Regressions extends AbstractDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") public void testAmbiguityOnLazyTypeComputation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.kt"); doTest(fileName); } @TestMetadata("AssignmentsUnderOperators.kt") public void testAssignmentsUnderOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.kt"); doTest(fileName); } @TestMetadata("CoercionToUnit.kt") public void testCoercionToUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/CoercionToUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/CoercionToUnit.kt"); doTest(fileName); } @TestMetadata("DoubleDefine.kt") public void testDoubleDefine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt"); doTest(fileName); } @TestMetadata("ea40964.kt") public void testEa40964() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea40964.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea40964.kt"); doTest(fileName); } @TestMetadata("ea43298.kt") public void testEa43298() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea43298.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea43298.kt"); doTest(fileName); } @TestMetadata("ea53340.kt") public void testEa53340() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea53340.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea53340.kt"); doTest(fileName); } @TestMetadata("ea65509.kt") public void testEa65509() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea65509.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea65509.kt"); doTest(fileName); } @TestMetadata("ea66984.kt") public void testEa66984() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea66984.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea66984.kt"); doTest(fileName); } @TestMetadata("ea69735.kt") public void testEa69735() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea69735.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea69735.kt"); doTest(fileName); } @TestMetadata("ea72837.kt") public void testEa72837() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea72837.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea72837.kt"); doTest(fileName); } @TestMetadata("ErrorsOnIbjectExpressionsAsParameters.kt") public void testErrorsOnIbjectExpressionsAsParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.kt"); doTest(fileName); } @TestMetadata("intchar.kt") public void testIntchar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/intchar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/intchar.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBound.kt") public void testItselfAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBound.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBoundInClass.kt") public void testItselfAsUpperBoundInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClass.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBoundInClassNotNull.kt") public void testItselfAsUpperBoundInClassNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundInClassNotNull.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBoundLocal.kt") public void testItselfAsUpperBoundLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBoundMember.kt") public void testItselfAsUpperBoundMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundMember.kt"); doTest(fileName); } @TestMetadata("itselfAsUpperBoundNotNull.kt") public void testItselfAsUpperBoundNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundNotNull.kt"); doTest(fileName); } @TestMetadata("Jet11.kt") public void testJet11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet11.kt"); doTest(fileName); } @TestMetadata("Jet121.kt") public void testJet121() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet121.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet121.kt"); doTest(fileName); } @TestMetadata("Jet124.kt") public void testJet124() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet124.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet124.kt"); doTest(fileName); } @TestMetadata("Jet169.kt") public void testJet169() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet169.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet169.kt"); doTest(fileName); } @TestMetadata("Jet17.kt") public void testJet17() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet17.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet17.kt"); doTest(fileName); } @TestMetadata("Jet183.kt") public void testJet183() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183.kt"); doTest(fileName); } @TestMetadata("Jet183-1.kt") public void testJet183_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt"); doTest(fileName); } @TestMetadata("Jet53.kt") public void testJet53() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet53.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet53.kt"); doTest(fileName); } @TestMetadata("Jet67.kt") public void testJet67() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet67.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet67.kt"); doTest(fileName); } @TestMetadata("Jet68.kt") public void testJet68() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet68.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet68.kt"); doTest(fileName); } @TestMetadata("Jet69.kt") public void testJet69() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet69.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet69.kt"); doTest(fileName); } @TestMetadata("Jet72.kt") public void testJet72() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet72.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet72.kt"); doTest(fileName); } @TestMetadata("Jet81.kt") public void testJet81() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet81.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet81.kt"); doTest(fileName); } @TestMetadata("kt127.kt") public void testKt127() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt127.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt127.kt"); doTest(fileName); } @TestMetadata("kt128.kt") public void testKt128() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt128.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt128.kt"); doTest(fileName); } @TestMetadata("kt1489_1728.kt") public void testKt1489_1728() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt"); doTest(fileName); } @TestMetadata("kt1550.kt") public void testKt1550() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1550.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1550.kt"); doTest(fileName); } @TestMetadata("kt1639-JFrame.kt") public void testKt1639_JFrame() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt"); doTest(fileName); } @TestMetadata("kt1647.kt") public void testKt1647() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1647.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1647.kt"); doTest(fileName); } @TestMetadata("kt1736.kt") public void testKt1736() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1736.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1736.kt"); doTest(fileName); } @TestMetadata("kt174.kt") public void testKt174() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt174.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt174.kt"); doTest(fileName); } @TestMetadata("kt201.kt") public void testKt201() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt201.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt201.kt"); doTest(fileName); } @TestMetadata("kt235.kt") public void testKt235() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt235.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt235.kt"); doTest(fileName); } @TestMetadata("kt2376.kt") public void testKt2376() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2376.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2376.kt"); doTest(fileName); } @TestMetadata("kt251.kt") public void testKt251() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt251.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt251.kt"); doTest(fileName); } @TestMetadata("kt258.kt") public void testKt258() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt258.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt258.kt"); doTest(fileName); } @TestMetadata("kt26.kt") public void testKt26() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26.kt"); doTest(fileName); } @TestMetadata("kt26-1.kt") public void testKt26_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26-1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26-1.kt"); doTest(fileName); } @TestMetadata("kt2768.kt") public void testKt2768() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2768.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2768.kt"); doTest(fileName); } @TestMetadata("kt282.kt") public void testKt282() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt282.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt282.kt"); doTest(fileName); } @TestMetadata("kt287.kt") public void testKt287() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt287.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt287.kt"); doTest(fileName); } @TestMetadata("kt2956.kt") public void testKt2956() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2956.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2956.kt"); doTest(fileName); } @TestMetadata("kt302.kt") public void testKt302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt302.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt302.kt"); doTest(fileName); } @TestMetadata("kt306.kt") public void testKt306() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt306.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt306.kt"); doTest(fileName); } @TestMetadata("kt307.kt") public void testKt307() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt307.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt307.kt"); doTest(fileName); } @TestMetadata("kt312.kt") public void testKt312() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt312.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt312.kt"); doTest(fileName); } @TestMetadata("kt313.kt") public void testKt313() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt313.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt313.kt"); doTest(fileName); } @TestMetadata("kt316.kt") public void testKt316() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt316.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt316.kt"); doTest(fileName); } @TestMetadata("kt328.kt") public void testKt328() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt328.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt328.kt"); doTest(fileName); } @TestMetadata("kt334.kt") public void testKt334() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt334.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt334.kt"); doTest(fileName); } @TestMetadata("kt335.336.kt") public void testKt335_336() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt335.336.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt335.336.kt"); doTest(fileName); } @TestMetadata("kt337.kt") public void testKt337() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt337.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt337.kt"); doTest(fileName); } @TestMetadata("kt352.kt") public void testKt352() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt352.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt352.kt"); doTest(fileName); } @TestMetadata("kt353.kt") public void testKt353() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt353.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt353.kt"); doTest(fileName); } @TestMetadata("kt3535.kt") public void testKt3535() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3535.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3535.kt"); doTest(fileName); } @TestMetadata("kt3647.kt") public void testKt3647() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3647.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3647.kt"); doTest(fileName); } @TestMetadata("kt3731.kt") public void testKt3731() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3731.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3731.kt"); doTest(fileName); } @TestMetadata("kt3810.kt") public void testKt3810() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3810.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt3810.kt"); doTest(fileName); } @TestMetadata("kt385.109.441.kt") public void testKt385_109_441() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt"); doTest(fileName); } @TestMetadata("kt394.kt") public void testKt394() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt394.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt394.kt"); doTest(fileName); } @TestMetadata("kt398.kt") public void testKt398() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt398.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt398.kt"); doTest(fileName); } @TestMetadata("kt399.kt") public void testKt399() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt399.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt399.kt"); doTest(fileName); } @TestMetadata("kt402.kt") public void testKt402() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt402.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt402.kt"); doTest(fileName); } @TestMetadata("kt41.kt") public void testKt41() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt41.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt41.kt"); doTest(fileName); } @TestMetadata("kt411.kt") public void testKt411() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt411.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt411.kt"); doTest(fileName); } @TestMetadata("kt439.kt") public void testKt439() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt439.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt439.kt"); doTest(fileName); } @TestMetadata("kt442.kt") public void testKt442() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt442.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt442.kt"); doTest(fileName); } @TestMetadata("kt443.kt") public void testKt443() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt443.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt443.kt"); doTest(fileName); } @TestMetadata("kt455.kt") public void testKt455() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt455.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt455.kt"); doTest(fileName); } @TestMetadata("kt456.kt") public void testKt456() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt456.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt456.kt"); doTest(fileName); } @TestMetadata("kt459.kt") public void testKt459() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt459.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt459.kt"); doTest(fileName); } @TestMetadata("kt469.kt") public void testKt469() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt469.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt469.kt"); doTest(fileName); } @TestMetadata("kt4693.kt") public void testKt4693() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt4693.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt4693.kt"); doTest(fileName); } @TestMetadata("kt4827.kt") public void testKt4827() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt4827.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt4827.kt"); doTest(fileName); } @TestMetadata("kt498.kt") public void testKt498() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt498.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt498.kt"); doTest(fileName); } @TestMetadata("kt524.kt") public void testKt524() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt524.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt524.kt"); doTest(fileName); } @TestMetadata("kt526UnresolvedReferenceInnerStatic.kt") public void testKt526UnresolvedReferenceInnerStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt"); doTest(fileName); } @TestMetadata("kt5326.kt") public void testKt5326() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt5326.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt5326.kt"); doTest(fileName); } @TestMetadata("kt5362.kt") public void testKt5362() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt5362.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt5362.kt"); doTest(fileName); } @TestMetadata("kt549.kt") public void testKt549() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt549.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt549.kt"); doTest(fileName); } @TestMetadata("kt557.kt") public void testKt557() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt557.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt557.kt"); doTest(fileName); } @TestMetadata("kt571.kt") public void testKt571() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt571.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt571.kt"); doTest(fileName); } @TestMetadata("kt575.kt") public void testKt575() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt575.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt575.kt"); doTest(fileName); } @TestMetadata("kt58.kt") public void testKt58() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt58.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt58.kt"); doTest(fileName); } @TestMetadata("kt580.kt") public void testKt580() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt580.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt580.kt"); doTest(fileName); } @TestMetadata("kt588.kt") public void testKt588() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt588.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt588.kt"); doTest(fileName); } @TestMetadata("kt597.kt") public void testKt597() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt597.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt597.kt"); doTest(fileName); } @TestMetadata("kt600.kt") public void testKt600() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt600.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt600.kt"); doTest(fileName); } @TestMetadata("kt604.kt") public void testKt604() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt604.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt604.kt"); doTest(fileName); } @TestMetadata("kt618.kt") public void testKt618() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt618.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt618.kt"); doTest(fileName); } @TestMetadata("kt629.kt") public void testKt629() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt629.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt629.kt"); doTest(fileName); } @TestMetadata("kt630.kt") public void testKt630() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt630.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt630.kt"); doTest(fileName); } @TestMetadata("kt6508.kt") public void testKt6508() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt6508.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt6508.kt"); doTest(fileName); } @TestMetadata("kt688.kt") public void testKt688() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt688.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt688.kt"); doTest(fileName); } @TestMetadata("kt691.kt") public void testKt691() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt691.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt691.kt"); doTest(fileName); } @TestMetadata("kt701.kt") public void testKt701() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt701.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt701.kt"); doTest(fileName); } @TestMetadata("kt716.kt") public void testKt716() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt716.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt716.kt"); doTest(fileName); } @TestMetadata("kt743.kt") public void testKt743() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt743.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt743.kt"); doTest(fileName); } @TestMetadata("kt750.kt") public void testKt750() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt750.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt750.kt"); doTest(fileName); } @TestMetadata("kt762.kt") public void testKt762() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt762.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt762.kt"); doTest(fileName); } @TestMetadata("kt847.kt") public void testKt847() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt847.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt847.kt"); doTest(fileName); } @TestMetadata("kt860.kt") public void testKt860() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt860.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt860.kt"); doTest(fileName); } @TestMetadata("OrphanStarProjection.kt") public void testOrphanStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.kt"); doTest(fileName); } @TestMetadata("OutProjections.kt") public void testOutProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OutProjections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OutProjections.kt"); doTest(fileName); } @TestMetadata("OverrideResolution.kt") public void testOverrideResolution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OverrideResolution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OverrideResolution.kt"); doTest(fileName); } @TestMetadata("resolveSubclassOfList.kt") public void testResolveSubclassOfList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt"); doTest(fileName); } @TestMetadata("SpecififcityByReceiver.kt") public void testSpecififcityByReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt"); doTest(fileName); } @TestMetadata("TypeMismatchOnUnaryOperations.kt") public void testTypeMismatchOnUnaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt"); doTest(fileName); } @TestMetadata("TypeParameterAsASupertype.kt") public void testTypeParameterAsASupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.kt"); doTest(fileName); } @TestMetadata("UnavaliableQualifiedThis.kt") public void testUnavaliableQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.kt"); doTest(fileName); } @TestMetadata("WrongTraceInCallResolver.kt") public void testWrongTraceInCallResolver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/regressions/kt7585") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Kt7585 extends AbstractJetDiagnosticsTest { + public static class Kt7585 extends AbstractDiagnosticsTest { public void testAllFilesPresentInKt7585() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions/kt7585"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions/kt7585"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("base.kt") public void testBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/base.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/base.kt"); doTest(fileName); } @TestMetadata("java.kt") public void testJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/java.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/java.kt"); doTest(fileName); } @TestMetadata("twoparents.kt") public void testTwoparents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/twoparents.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt7585/twoparents.kt"); doTest(fileName); } } @@ -12892,270 +12892,270 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Resolve extends AbstractJetDiagnosticsTest { + public static class Resolve extends AbstractDiagnosticsTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguityOnPropertiesWithTheSamePackageName.kt") public void testAmbiguityOnPropertiesWithTheSamePackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.kt"); doTest(fileName); } @TestMetadata("ambiguityWithTwoCorrespondingFunctionTypes.kt") public void testAmbiguityWithTwoCorrespondingFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/ambiguityWithTwoCorrespondingFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/ambiguityWithTwoCorrespondingFunctionTypes.kt"); doTest(fileName); } @TestMetadata("CycleInTypeArgs.kt") public void testCycleInTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt"); doTest(fileName); } @TestMetadata("HiddenDeclarations.kt") public void testHiddenDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/HiddenDeclarations.kt"); doTest(fileName); } @TestMetadata("incompleteConstructorInvocation.kt") public void testIncompleteConstructorInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.kt"); doTest(fileName); } @TestMetadata("inferenceInLinkedLambdas.kt") public void testInferenceInLinkedLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdas.kt"); doTest(fileName); } @TestMetadata("inferenceInLinkedLambdasDependentOnExpectedType.kt") public void testInferenceInLinkedLambdasDependentOnExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.kt"); doTest(fileName); } @TestMetadata("objectLiteralAsArgument.kt") public void testObjectLiteralAsArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/objectLiteralAsArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/objectLiteralAsArgument.kt"); doTest(fileName); } @TestMetadata("resolveAnnotatedLambdaArgument.kt") public void testResolveAnnotatedLambdaArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveAnnotatedLambdaArgument.kt"); doTest(fileName); } @TestMetadata("resolveTypeArgsForUnresolvedCall.kt") public void testResolveTypeArgsForUnresolvedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveTypeArgsForUnresolvedCall.kt"); doTest(fileName); } @TestMetadata("resolveWithFunctionLiteralWithId.kt") public void testResolveWithFunctionLiteralWithId() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.kt"); doTest(fileName); } @TestMetadata("resolveWithFunctionLiterals.kt") public void testResolveWithFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("resolveWithFunctionLiteralsOverload.kt") public void testResolveWithFunctionLiteralsOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.kt"); doTest(fileName); } @TestMetadata("resolveWithGenerics.kt") public void testResolveWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.kt"); doTest(fileName); } @TestMetadata("resolveWithRedeclarationError.kt") public void testResolveWithRedeclarationError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.kt"); doTest(fileName); } @TestMetadata("resolveWithSpecifiedFunctionLiteralWithId.kt") public void testResolveWithSpecifiedFunctionLiteralWithId() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt"); doTest(fileName); } @TestMetadata("resolveWithoutGenerics.kt") public void testResolveWithoutGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.kt"); doTest(fileName); } @TestMetadata("wrongNumberOfTypeArguments.kt") public void testWrongNumberOfTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt"); doTest(fileName); } @TestMetadata("wrongReceiver.kt") public void testWrongReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Invoke extends AbstractJetDiagnosticsTest { + public static class Invoke extends AbstractDiagnosticsTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("extensionValueAsNonExtension.kt") public void testExtensionValueAsNonExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt"); doTest(fileName); } @TestMetadata("implicitInvoke.kt") public void testImplicitInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/implicitInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/implicitInvoke.kt"); doTest(fileName); } @TestMetadata("invokeAsExtension.kt") public void testInvokeAsExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.kt"); doTest(fileName); } @TestMetadata("invokeAsMember.kt") public void testInvokeAsMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.kt"); doTest(fileName); } @TestMetadata("invokeAsMemberExtension.kt") public void testInvokeAsMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.kt"); doTest(fileName); } @TestMetadata("invokeAsMemberExtensionToExplicitReceiver.kt") public void testInvokeAsMemberExtensionToExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("invokeNonExtensionLambdaInContext.kt") public void testInvokeNonExtensionLambdaInContext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeNonExtensionLambdaInContext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeNonExtensionLambdaInContext.kt"); doTest(fileName); } @TestMetadata("KT-4372.kt") public void testKT_4372() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.kt"); doTest(fileName); } @TestMetadata("kt3772.kt") public void testKt3772() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt"); doTest(fileName); } @TestMetadata("kt3833-invokeInsideNestedClass.kt") public void testKt3833_invokeInsideNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt"); doTest(fileName); } @TestMetadata("kt4204-completeNestedCallsForInvoke.kt") public void testKt4204_completeNestedCallsForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.kt"); doTest(fileName); } @TestMetadata("kt4321InvokeOnEnum.kt") public void testKt4321InvokeOnEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt"); doTest(fileName); } @TestMetadata("valNamedInvoke.kt") public void testValNamedInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.kt"); doTest(fileName); } @TestMetadata("wrongInvokeExtension.kt") public void testWrongInvokeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Errors extends AbstractJetDiagnosticsTest { + public static class Errors extends AbstractDiagnosticsTest { public void testAllFilesPresentInErrors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke/errors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke/errors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguityForInvoke.kt") public void testAmbiguityForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt"); doTest(fileName); } @TestMetadata("invisibleInvoke.kt") public void testInvisibleInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.kt"); doTest(fileName); } @TestMetadata("receiverPresenceErrorForInvoke.kt") public void testReceiverPresenceErrorForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt"); doTest(fileName); } @TestMetadata("typeInferenceErrorForInvoke.kt") public void testTypeInferenceErrorForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt"); doTest(fileName); } @TestMetadata("unresolvedInvoke.kt") public void testUnresolvedInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.kt"); doTest(fileName); } @TestMetadata("unsafeCallWithInvoke.kt") public void testUnsafeCallWithInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt"); doTest(fileName); } @TestMetadata("wrongReceiverForInvokeOnExpression.kt") public void testWrongReceiverForInvokeOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt"); doTest(fileName); } @TestMetadata("wrongReceiverTypeForInvoke.kt") public void testWrongReceiverTypeForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt"); doTest(fileName); } } @@ -13164,56 +13164,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NestedCalls extends AbstractJetDiagnosticsTest { + public static class NestedCalls extends AbstractDiagnosticsTest { public void testAllFilesPresentInNestedCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("analyzeArgsInFreeExpressionPosition.kt") public void testAnalyzeArgsInFreeExpressionPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt"); doTest(fileName); } @TestMetadata("analyzeUnmappedArguments.kt") public void testAnalyzeUnmappedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.kt"); doTest(fileName); } @TestMetadata("argumentsInParentheses.kt") public void testArgumentsInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.kt"); doTest(fileName); } @TestMetadata("completeTypeInferenceForNestedInNoneApplicable.kt") public void testCompleteTypeInferenceForNestedInNoneApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt"); doTest(fileName); } @TestMetadata("completeUnmappedArguments.kt") public void testCompleteUnmappedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.kt"); doTest(fileName); } @TestMetadata("kt5971NestedSafeCall.kt") public void testKt5971NestedSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.kt"); doTest(fileName); } @TestMetadata("kt7597.kt") public void testKt7597() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/kt7597.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/kt7597.kt"); doTest(fileName); } @TestMetadata("twoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt"); doTest(fileName); } } @@ -13221,44 +13221,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SpecialConstructions extends AbstractJetDiagnosticsTest { + public static class SpecialConstructions extends AbstractDiagnosticsTest { public void testAllFilesPresentInSpecialConstructions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/specialConstructions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/specialConstructions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constantsInIf.kt") public void testConstantsInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt"); doTest(fileName); } @TestMetadata("elvisAsCall.kt") public void testElvisAsCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt"); doTest(fileName); } @TestMetadata("exclExclAsCall.kt") public void testExclExclAsCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt"); doTest(fileName); } @TestMetadata("inferenceForElvis.kt") public void testInferenceForElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/inferenceForElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/inferenceForElvis.kt"); doTest(fileName); } @TestMetadata("multipleSuperClasses.kt") public void testMultipleSuperClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt"); doTest(fileName); } @TestMetadata("reportTypeMismatchDeeplyOnBranches.kt") public void testReportTypeMismatchDeeplyOnBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt"); doTest(fileName); } } @@ -13267,420 +13267,420 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/scopes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Scopes extends AbstractJetDiagnosticsTest { + public static class Scopes extends AbstractDiagnosticsTest { public void testAllFilesPresentInScopes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityBetweenRootAndPackage.kt") public void testAmbiguityBetweenRootAndPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt"); doTest(fileName); } @TestMetadata("AmbiguousNonExtensions.kt") public void testAmbiguousNonExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.kt"); doTest(fileName); } @TestMetadata("genericVsNested.kt") public void testGenericVsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/genericVsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/genericVsNested.kt"); doTest(fileName); } @TestMetadata("initializerScopeOfExtensionProperty.kt") public void testInitializerScopeOfExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt"); doTest(fileName); } @TestMetadata("invisibleSetter.kt") public void testInvisibleSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/invisibleSetter.kt"); doTest(fileName); } @TestMetadata("kt1078.kt") public void testKt1078() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1078.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1078.kt"); doTest(fileName); } @TestMetadata("kt1080.kt") public void testKt1080() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1080.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1080.kt"); doTest(fileName); } @TestMetadata("kt1244.kt") public void testKt1244() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1244.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1244.kt"); doTest(fileName); } @TestMetadata("kt1248.kt") public void testKt1248() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1248.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1248.kt"); doTest(fileName); } @TestMetadata("kt151.kt") public void testKt151() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt151.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt151.kt"); doTest(fileName); } @TestMetadata("kt1579.kt") public void testKt1579() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579.kt"); doTest(fileName); } @TestMetadata("kt1579_map_entry.kt") public void testKt1579_map_entry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt"); doTest(fileName); } @TestMetadata("kt1580.kt") public void testKt1580() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1580.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1580.kt"); doTest(fileName); } @TestMetadata("kt1642.kt") public void testKt1642() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1642.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1642.kt"); doTest(fileName); } @TestMetadata("kt1738.kt") public void testKt1738() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1738.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1738.kt"); doTest(fileName); } @TestMetadata("kt1805.kt") public void testKt1805() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1805.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1805.kt"); doTest(fileName); } @TestMetadata("kt1806.kt") public void testKt1806() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1806.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1806.kt"); doTest(fileName); } @TestMetadata("kt1822.kt") public void testKt1822() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1822.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1822.kt"); doTest(fileName); } @TestMetadata("kt1942.kt") public void testKt1942() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1942.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1942.kt"); doTest(fileName); } @TestMetadata("kt2262.kt") public void testKt2262() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt2262.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt2262.kt"); doTest(fileName); } @TestMetadata("kt250.617.10.kt") public void testKt250_617_10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt250.617.10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt250.617.10.kt"); doTest(fileName); } @TestMetadata("kt323.kt") public void testKt323() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt323.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt323.kt"); doTest(fileName); } @TestMetadata("kt37.kt") public void testKt37() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt37.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt37.kt"); doTest(fileName); } @TestMetadata("kt587.kt") public void testKt587() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt587.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt587.kt"); doTest(fileName); } @TestMetadata("kt900.kt") public void testKt900() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900.kt"); doTest(fileName); } @TestMetadata("kt900-1.kt") public void testKt900_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-1.kt"); doTest(fileName); } @TestMetadata("kt900-2.kt") public void testKt900_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-2.kt"); doTest(fileName); } @TestMetadata("kt939.kt") public void testKt939() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt939.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt939.kt"); doTest(fileName); } @TestMetadata("kt9430.kt") public void testKt9430() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt9430.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt9430.kt"); doTest(fileName); } @TestMetadata("NoAmbiguityBetweenRootAndPackage.kt") public void testNoAmbiguityBetweenRootAndPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.kt"); doTest(fileName); } @TestMetadata("sameClassNameResolve.kt") public void testSameClassNameResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/sameClassNameResolve.kt"); doTest(fileName); } @TestMetadata("stopResolutionOnAmbiguity.kt") public void testStopResolutionOnAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt"); doTest(fileName); } @TestMetadata("visibility.kt") public void testVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility.kt"); doTest(fileName); } @TestMetadata("visibility2.kt") public void testVisibility2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility2.kt"); doTest(fileName); } @TestMetadata("visibility3.kt") public void testVisibility3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility3.kt"); doTest(fileName); } @TestMetadata("VisibilityInClassObject.kt") public void testVisibilityInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt"); doTest(fileName); } @TestMetadata("VisibilityInheritModifier.kt") public void testVisibilityInheritModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/scopes/inheritance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inheritance extends AbstractJetDiagnosticsTest { + public static class Inheritance extends AbstractDiagnosticsTest { public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes/inheritance"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes/inheritance"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("companionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt"); doTest(fileName); } @TestMetadata("companionObjectAfterJava.kt") public void testCompanionObjectAfterJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt"); doTest(fileName); } @TestMetadata("companionObjectsOrder.kt") public void testCompanionObjectsOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectsOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectsOrder.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/innerClasses.kt"); doTest(fileName); } @TestMetadata("methodsPriority.kt") public void testMethodsPriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt"); doTest(fileName); } @TestMetadata("nestedClassesFromInterface.kt") public void testNestedClassesFromInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.kt"); doTest(fileName); } @TestMetadata("nestedCompanionClass.kt") public void testNestedCompanionClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt"); doTest(fileName); } @TestMetadata("nestedCompanionClassVsNested.kt") public void testNestedCompanionClassVsNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt"); doTest(fileName); } @TestMetadata("nestedCompanionClassVsNestedJava.kt") public void testNestedCompanionClassVsNestedJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt"); doTest(fileName); } @TestMetadata("nestedFromJava.kt") public void testNestedFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.kt"); doTest(fileName); } @TestMetadata("nestedFromJavaAfterKotlin.kt") public void testNestedFromJavaAfterKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJavaAfterKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJavaAfterKotlin.kt"); doTest(fileName); } @TestMetadata("nestedVsToplevelClass.kt") public void testNestedVsToplevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt"); doTest(fileName); } @TestMetadata("severalCompanions.kt") public void testSeveralCompanions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/severalCompanions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/severalCompanions.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractJetDiagnosticsTest { + public static class Statics extends AbstractDiagnosticsTest { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes/inheritance/statics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes/inheritance/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("hidePrivateByPublic.kt") public void testHidePrivateByPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/hidePrivateByPublic.kt"); doTest(fileName); } @TestMetadata("jjkj.kt") public void testJjkj() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/jjkj.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/jjkj.kt"); doTest(fileName); } @TestMetadata("kjk.kt") public void testKjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt"); doTest(fileName); } @TestMetadata("localVsStatic.kt") public void testLocalVsStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt"); doTest(fileName); } @TestMetadata("nameClash0.kt") public void testNameClash0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash0.kt"); doTest(fileName); } @TestMetadata("nameClash1.kt") public void testNameClash1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash1.kt"); doTest(fileName); } @TestMetadata("nameClash2.kt") public void testNameClash2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/nameClash2.kt"); doTest(fileName); } @TestMetadata("oneInterfaceManyTimes.kt") public void testOneInterfaceManyTimes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/oneInterfaceManyTimes.kt"); doTest(fileName); } @TestMetadata("overloadStatic.kt") public void testOverloadStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/overloadStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/overloadStatic.kt"); doTest(fileName); } @TestMetadata("staticFunVsImport.kt") public void testStaticFunVsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticFunVsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticFunVsImport.kt"); doTest(fileName); } @TestMetadata("staticPropertyVsImport.kt") public void testStaticPropertyVsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticPropertyVsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticPropertyVsImport.kt"); doTest(fileName); } @TestMetadata("staticVsCompanion.kt") public void testStaticVsCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsCompanion.kt"); doTest(fileName); } @TestMetadata("staticVsMember.kt") public void testStaticVsMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsMember.kt"); doTest(fileName); } @TestMetadata("staticVsOuter.kt") public void testStaticVsOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticVsOuter.kt"); doTest(fileName); } @TestMetadata("staticsFromjava.kt") public void testStaticsFromjava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjava.kt"); doTest(fileName); } @TestMetadata("staticsFromjavaAfterKotlin.kt") public void testStaticsFromjavaAfterKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjavaAfterKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/inheritance/statics/staticsFromjavaAfterKotlin.kt"); doTest(fileName); } } @@ -13690,14 +13690,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/script") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Script extends AbstractJetDiagnosticsTest { + public static class Script extends AbstractDiagnosticsTest { public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("varInScript.kt") public void testVarInScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/varInScript.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/varInScript.kt"); doTest(fileName); } } @@ -13705,182 +13705,182 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/sealed") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Sealed extends AbstractJetDiagnosticsTest { + public static class Sealed extends AbstractDiagnosticsTest { public void testAllFilesPresentInSealed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/sealed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/sealed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoubleInner.kt") public void testDoubleInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/DoubleInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/DoubleInner.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhen.kt") public void testExhaustiveWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhen.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenDoubleInner.kt") public void testExhaustiveWhenDoubleInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenDoubleInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenDoubleInner.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenMultipleInner.kt") public void testExhaustiveWhenMultipleInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenMultipleInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenMultipleInner.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenNegated.kt") public void testExhaustiveWhenNegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenNegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenNegated.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenNegatedTwice.kt") public void testExhaustiveWhenNegatedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenNegatedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenNegatedTwice.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenOnNestedSealed.kt") public void testExhaustiveWhenOnNestedSealed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenOnNestedSealed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenOnNestedSealed.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenOnNullable.kt") public void testExhaustiveWhenOnNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenOnNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenOnNullable.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenWithAdditionalMember.kt") public void testExhaustiveWhenWithAdditionalMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithAdditionalMember.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWhenWithElse.kt") public void testExhaustiveWhenWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/ExhaustiveWhenWithElse.kt"); doTest(fileName); } @TestMetadata("Local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/Local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/Local.kt"); doTest(fileName); } @TestMetadata("NeverConstructed.kt") public void testNeverConstructed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverConstructed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverConstructed.kt"); doTest(fileName); } @TestMetadata("NeverDerived.kt") public void testNeverDerived() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverDerived.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverDerived.kt"); doTest(fileName); } @TestMetadata("NeverEnum.kt") public void testNeverEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverEnum.kt"); doTest(fileName); } @TestMetadata("NeverFinal.kt") public void testNeverFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverFinal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverFinal.kt"); doTest(fileName); } @TestMetadata("NeverInterface.kt") public void testNeverInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverInterface.kt"); doTest(fileName); } @TestMetadata("NeverObject.kt") public void testNeverObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverObject.kt"); doTest(fileName); } @TestMetadata("NeverOpen.kt") public void testNeverOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NeverOpen.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWhen.kt") public void testNonExhaustiveWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhen.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWhenNegated.kt") public void testNonExhaustiveWhenNegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenNegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenNegated.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWhenWithAdditionalCase.kt") public void testNonExhaustiveWhenWithAdditionalCase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenWithAdditionalCase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenWithAdditionalCase.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWhenWithAnyCase.kt") public void testNonExhaustiveWhenWithAnyCase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenWithAnyCase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NonExhaustiveWhenWithAnyCase.kt"); doTest(fileName); } @TestMetadata("NotFinal.kt") public void testNotFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NotFinal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/NotFinal.kt"); doTest(fileName); } @TestMetadata("OperationWhen.kt") public void testOperationWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/OperationWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/OperationWhen.kt"); doTest(fileName); } @TestMetadata("RedundantAbstract.kt") public void testRedundantAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/RedundantAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/RedundantAbstract.kt"); doTest(fileName); } @TestMetadata("TreeWhen.kt") public void testTreeWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhen.kt"); doTest(fileName); } @TestMetadata("TreeWhenFunctional.kt") public void testTreeWhenFunctional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhenFunctional.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhenFunctional.kt"); doTest(fileName); } @TestMetadata("TreeWhenFunctionalNoIs.kt") public void testTreeWhenFunctionalNoIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhenFunctionalNoIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/TreeWhenFunctionalNoIs.kt"); doTest(fileName); } @TestMetadata("WhenOnEmptySealed.kt") public void testWhenOnEmptySealed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/WhenOnEmptySealed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/sealed/WhenOnEmptySealed.kt"); doTest(fileName); } } @@ -13888,364 +13888,364 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/secondaryConstructors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SecondaryConstructors extends AbstractJetDiagnosticsTest { + public static class SecondaryConstructors extends AbstractDiagnosticsTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentsResolveInBodyAndDelegationCall.kt") public void testArgumentsResolveInBodyAndDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/argumentsResolveInBodyAndDelegationCall.kt"); doTest(fileName); } @TestMetadata("classInitializersWithoutPrimary.kt") public void testClassInitializersWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/classInitializersWithoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/classInitializersWithoutPrimary.kt"); doTest(fileName); } @TestMetadata("companionObjectScope.kt") public void testCompanionObjectScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/companionObjectScope.kt"); doTest(fileName); } @TestMetadata("constructorCallType.kt") public void testConstructorCallType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt"); doTest(fileName); } @TestMetadata("constructorInObject.kt") public void testConstructorInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorInObject.kt"); doTest(fileName); } @TestMetadata("constructorInTrait.kt") public void testConstructorInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/constructorInTrait.kt"); doTest(fileName); } @TestMetadata("ctrsAnnotationResolve.kt") public void testCtrsAnnotationResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt"); doTest(fileName); } @TestMetadata("cyclicDelegationCalls.kt") public void testCyclicDelegationCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/cyclicDelegationCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/cyclicDelegationCalls.kt"); doTest(fileName); } @TestMetadata("dataClasses.kt") public void testDataClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/dataClasses.kt"); doTest(fileName); } @TestMetadata("dataFlowInDelegationCall.kt") public void testDataFlowInDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/dataFlowInDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/dataFlowInDelegationCall.kt"); doTest(fileName); } @TestMetadata("delegationByWithoutPrimary.kt") public void testDelegationByWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/delegationByWithoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/delegationByWithoutPrimary.kt"); doTest(fileName); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/enums.kt"); doTest(fileName); } @TestMetadata("errorsOnEmptyDelegationCall.kt") public void testErrorsOnEmptyDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt"); doTest(fileName); } @TestMetadata("expectedPrimaryConstructorCall.kt") public void testExpectedPrimaryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/expectedPrimaryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/expectedPrimaryConstructorCall.kt"); doTest(fileName); } @TestMetadata("generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics.kt"); doTest(fileName); } @TestMetadata("generics2.kt") public void testGenerics2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt"); doTest(fileName); } @TestMetadata("generics3.kt") public void testGenerics3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/generics3.kt"); doTest(fileName); } @TestMetadata("headerSupertypeInitialization.kt") public void testHeaderSupertypeInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerSupertypeInitialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerSupertypeInitialization.kt"); doTest(fileName); } @TestMetadata("implicitSuperCallErrorsIfPrimary.kt") public void testImplicitSuperCallErrorsIfPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/implicitSuperCallErrorsIfPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/implicitSuperCallErrorsIfPrimary.kt"); doTest(fileName); } @TestMetadata("initializationFromOtherInstance.kt") public void testInitializationFromOtherInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/initializationFromOtherInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/initializationFromOtherInstance.kt"); doTest(fileName); } @TestMetadata("kt6992.kt") public void testKt6992() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6992.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6992.kt"); doTest(fileName); } @TestMetadata("kt6993.kt") public void testKt6993() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt"); doTest(fileName); } @TestMetadata("kt6994.kt") public void testKt6994() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6994.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/kt6994.kt"); doTest(fileName); } @TestMetadata("lambdaInDelegation.kt") public void testLambdaInDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/lambdaInDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/lambdaInDelegation.kt"); doTest(fileName); } @TestMetadata("nestedExtendsInner.kt") public void testNestedExtendsInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/nestedExtendsInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/nestedExtendsInner.kt"); doTest(fileName); } @TestMetadata("noDefaultIfEmptySecondary.kt") public void testNoDefaultIfEmptySecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noDefaultIfEmptySecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noDefaultIfEmptySecondary.kt"); doTest(fileName); } @TestMetadata("noPrimaryConstructor.kt") public void testNoPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt"); doTest(fileName); } @TestMetadata("noSupertypeInitWithSecondaryConstructors.kt") public void testNoSupertypeInitWithSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noSupertypeInitWithSecondaryConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/noSupertypeInitWithSecondaryConstructors.kt"); doTest(fileName); } @TestMetadata("propertyInitializationWithPrimary.kt") public void testPropertyInitializationWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/propertyInitializationWithPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/propertyInitializationWithPrimary.kt"); doTest(fileName); } @TestMetadata("propertyInitializationWithoutPrimary.kt") public void testPropertyInitializationWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/propertyInitializationWithoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/propertyInitializationWithoutPrimary.kt"); doTest(fileName); } @TestMetadata("redeclarations.kt") public void testRedeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt"); doTest(fileName); } @TestMetadata("redeclarationsOfConstructorsIgnored.kt") public void testRedeclarationsOfConstructorsIgnored() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/redeclarationsOfConstructorsIgnored.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/redeclarationsOfConstructorsIgnored.kt"); doTest(fileName); } @TestMetadata("reportResolutionErrorOnImplicitOnce.kt") public void testReportResolutionErrorOnImplicitOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/reportResolutionErrorOnImplicitOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/reportResolutionErrorOnImplicitOnce.kt"); doTest(fileName); } @TestMetadata("resolvePropertyInitializerWithoutPrimary.kt") public void testResolvePropertyInitializerWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/resolvePropertyInitializerWithoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/resolvePropertyInitializerWithoutPrimary.kt"); doTest(fileName); } @TestMetadata("return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/return.kt"); doTest(fileName); } @TestMetadata("superAnyNonEmpty.kt") public void testSuperAnyNonEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/superAnyNonEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/superAnyNonEmpty.kt"); doTest(fileName); } @TestMetadata("superSecondaryNonExisting.kt") public void testSuperSecondaryNonExisting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/superSecondaryNonExisting.kt"); doTest(fileName); } @TestMetadata("thisNonExisting.kt") public void testThisNonExisting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt"); doTest(fileName); } @TestMetadata("unreachableCode.kt") public void testUnreachableCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/unreachableCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/unreachableCode.kt"); doTest(fileName); } @TestMetadata("useOfPropertiesWithPrimary.kt") public void testUseOfPropertiesWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/useOfPropertiesWithPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/useOfPropertiesWithPrimary.kt"); doTest(fileName); } @TestMetadata("useOfPropertiesWithoutPrimary.kt") public void testUseOfPropertiesWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/useOfPropertiesWithoutPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/useOfPropertiesWithoutPrimary.kt"); doTest(fileName); } @TestMetadata("valOrValAndModifiersInCtr.kt") public void testValOrValAndModifiersInCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/valOrValAndModifiersInCtr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/valOrValAndModifiersInCtr.kt"); doTest(fileName); } @TestMetadata("varargsInDelegationCallToPrimary.kt") public void testVarargsInDelegationCallToPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/varargsInDelegationCallToPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/varargsInDelegationCallToPrimary.kt"); doTest(fileName); } @TestMetadata("varargsInDelegationCallToSecondary.kt") public void testVarargsInDelegationCallToSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/varargsInDelegationCallToSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/varargsInDelegationCallToSecondary.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class HeaderCallChecker extends AbstractJetDiagnosticsTest { + public static class HeaderCallChecker extends AbstractDiagnosticsTest { @TestMetadata("accessBaseGenericFromInnerExtendingSameBase.kt") public void testAccessBaseGenericFromInnerExtendingSameBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseGenericFromInnerExtendingSameBase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseGenericFromInnerExtendingSameBase.kt"); doTest(fileName); } @TestMetadata("accessBaseGenericFromInnerExtendingSameBase2.kt") public void testAccessBaseGenericFromInnerExtendingSameBase2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseGenericFromInnerExtendingSameBase2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseGenericFromInnerExtendingSameBase2.kt"); doTest(fileName); } @TestMetadata("accessBaseWithSameExtension.kt") public void testAccessBaseWithSameExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseWithSameExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessBaseWithSameExtension.kt"); doTest(fileName); } @TestMetadata("accessGenericBaseWithSameExtension.kt") public void testAccessGenericBaseWithSameExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessGenericBaseWithSameExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/accessGenericBaseWithSameExtension.kt"); doTest(fileName); } public void testAllFilesPresentInHeaderCallChecker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerInstanceCreation.kt") public void testInnerInstanceCreation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/innerInstanceCreation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/innerInstanceCreation.kt"); doTest(fileName); } @TestMetadata("memberFunAccess.kt") public void testMemberFunAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/memberFunAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/memberFunAccess.kt"); doTest(fileName); } @TestMetadata("passingInstance.kt") public void testPassingInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/passingInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/passingInstance.kt"); doTest(fileName); } @TestMetadata("propertyAccess.kt") public void testPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/propertyAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/propertyAccess.kt"); doTest(fileName); } @TestMetadata("propertyAccessUnitialized.kt") public void testPropertyAccessUnitialized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/propertyAccessUnitialized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/propertyAccessUnitialized.kt"); doTest(fileName); } @TestMetadata("superFunAccess.kt") public void testSuperFunAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccess.kt"); doTest(fileName); } @TestMetadata("superFunAccessOverriden.kt") public void testSuperFunAccessOverriden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccessOverriden.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccessOverriden.kt"); doTest(fileName); } @TestMetadata("superPropertyAccess.kt") public void testSuperPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superPropertyAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superPropertyAccess.kt"); doTest(fileName); } @TestMetadata("usingOuterInstance.kt") public void testUsingOuterInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/usingOuterInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/usingOuterInstance.kt"); doTest(fileName); } @TestMetadata("usingOuterProperty.kt") public void testUsingOuterProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/usingOuterProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/usingOuterProperty.kt"); doTest(fileName); } } @@ -14254,14 +14254,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/senselessComparison") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SenselessComparison extends AbstractJetDiagnosticsTest { + public static class SenselessComparison extends AbstractDiagnosticsTest { public void testAllFilesPresentInSenselessComparison() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/senselessComparison"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/senselessComparison"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("parenthesized.kt") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/senselessComparison/parenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/senselessComparison/parenthesized.kt"); doTest(fileName); } } @@ -14269,68 +14269,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/shadowing") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Shadowing extends AbstractJetDiagnosticsTest { + public static class Shadowing extends AbstractDiagnosticsTest { public void testAllFilesPresentInShadowing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ShadowMultiDeclarationWithFunParameter.kt") public void testShadowMultiDeclarationWithFunParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt"); doTest(fileName); } @TestMetadata("ShadowParameterInFunctionBody.kt") public void testShadowParameterInFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.kt"); doTest(fileName); } @TestMetadata("ShadowParameterInNestedBlockInFor.kt") public void testShadowParameterInNestedBlockInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.kt"); doTest(fileName); } @TestMetadata("ShadowPropertyInClosure.kt") public void testShadowPropertyInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.kt"); doTest(fileName); } @TestMetadata("ShadowPropertyInFor.kt") public void testShadowPropertyInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.kt"); doTest(fileName); } @TestMetadata("ShadowPropertyInFunction.kt") public void testShadowPropertyInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.kt"); doTest(fileName); } @TestMetadata("ShadowVariableInFor.kt") public void testShadowVariableInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.kt"); doTest(fileName); } @TestMetadata("ShadowVariableInNestedBlock.kt") public void testShadowVariableInNestedBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.kt"); doTest(fileName); } @TestMetadata("ShadowVariableInNestedClosure.kt") public void testShadowVariableInNestedClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.kt"); doTest(fileName); } @TestMetadata("ShadowVariableInNestedClosureParam.kt") public void testShadowVariableInNestedClosureParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.kt"); doTest(fileName); } } @@ -14338,412 +14338,412 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SmartCasts extends AbstractJetDiagnosticsTest { + public static class SmartCasts extends AbstractDiagnosticsTest { @TestMetadata("afterBinaryExpr.kt") public void testAfterBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt"); doTest(fileName); } public void testAllFilesPresentInSmartCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectMember.kt") public void testClassObjectMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt"); doTest(fileName); } @TestMetadata("combineWithNoSelectorInfo.kt") public void testCombineWithNoSelectorInfo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.kt"); doTest(fileName); } @TestMetadata("comparisonUnderAnd.kt") public void testComparisonUnderAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt"); doTest(fileName); } @TestMetadata("complexComparison.kt") public void testComplexComparison() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt"); doTest(fileName); } @TestMetadata("complexConditionsWithExcl.kt") public void testComplexConditionsWithExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/complexConditionsWithExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/complexConditionsWithExcl.kt"); doTest(fileName); } @TestMetadata("dataFlowInfoForArguments.kt") public void testDataFlowInfoForArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.kt"); doTest(fileName); } @TestMetadata("elvisExclExcl.kt") public void testElvisExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExcl.kt"); doTest(fileName); } @TestMetadata("elvisExclExclMerge.kt") public void testElvisExclExclMerge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExclMerge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExclMerge.kt"); doTest(fileName); } @TestMetadata("elvisExclExclPlatform.kt") public void testElvisExclExclPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExclPlatform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisExclExclPlatform.kt"); doTest(fileName); } @TestMetadata("elvisNothingRHS.kt") public void testElvisNothingRHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.kt"); doTest(fileName); } @TestMetadata("elvisRHS.kt") public void testElvisRHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisRHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/elvisRHS.kt"); doTest(fileName); } @TestMetadata("exclUnderAnd.kt") public void testExclUnderAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/exclUnderAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/exclUnderAnd.kt"); doTest(fileName); } @TestMetadata("extensionSafeCall.kt") public void testExtensionSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/extensionSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/extensionSafeCall.kt"); doTest(fileName); } @TestMetadata("fieldExclExcl.kt") public void testFieldExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldExclExcl.kt"); doTest(fileName); } @TestMetadata("fieldInGetter.kt") public void testFieldInGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldInGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldInGetter.kt"); doTest(fileName); } @TestMetadata("fieldPlus.kt") public void testFieldPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/fieldPlus.kt"); doTest(fileName); } @TestMetadata("kt1461.kt") public void testKt1461() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt1461.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt1461.kt"); doTest(fileName); } @TestMetadata("kt2422.kt") public void testKt2422() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt2422.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt2422.kt"); doTest(fileName); } @TestMetadata("kt2865.kt") public void testKt2865() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt2865.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt2865.kt"); doTest(fileName); } @TestMetadata("kt3224.kt") public void testKt3224() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3224.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3224.kt"); doTest(fileName); } @TestMetadata("kt3244.kt") public void testKt3244() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3244.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3244.kt"); doTest(fileName); } @TestMetadata("kt3572.kt") public void testKt3572() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3572.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3572.kt"); doTest(fileName); } @TestMetadata("kt3711.kt") public void testKt3711() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3711.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3711.kt"); doTest(fileName); } @TestMetadata("kt3899.kt") public void testKt3899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3899.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3899.kt"); doTest(fileName); } @TestMetadata("kt3993.kt") public void testKt3993() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3993.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt3993.kt"); doTest(fileName); } @TestMetadata("kt5427.kt") public void testKt5427() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt5427.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt5427.kt"); doTest(fileName); } @TestMetadata("kt5455.kt") public void testKt5455() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt5455.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt5455.kt"); doTest(fileName); } @TestMetadata("kt6819.kt") public void testKt6819() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt6819.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt6819.kt"); doTest(fileName); } @TestMetadata("kt7561.kt") public void testKt7561() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt7561.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt7561.kt"); doTest(fileName); } @TestMetadata("lambdaAndArgument.kt") public void testLambdaAndArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaAndArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaAndArgument.kt"); doTest(fileName); } @TestMetadata("lambdaAndArgumentFun.kt") public void testLambdaAndArgumentFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaAndArgumentFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaAndArgumentFun.kt"); doTest(fileName); } @TestMetadata("lambdaCall.kt") public void testLambdaCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaCall.kt"); doTest(fileName); } @TestMetadata("lambdaCallAnnotated.kt") public void testLambdaCallAnnotated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaCallAnnotated.kt"); doTest(fileName); } @TestMetadata("lambdaDeclaresAndModifies.kt") public void testLambdaDeclaresAndModifies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifies.kt"); doTest(fileName); } @TestMetadata("lambdaDeclaresAndModifiesInLoop.kt") public void testLambdaDeclaresAndModifiesInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesInLoop.kt"); doTest(fileName); } @TestMetadata("lambdaDeclaresAndModifiesInSecondary.kt") public void testLambdaDeclaresAndModifiesInSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesInSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesInSecondary.kt"); doTest(fileName); } @TestMetadata("lambdaDeclaresAndModifiesWithDirectEq.kt") public void testLambdaDeclaresAndModifiesWithDirectEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesWithDirectEq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaDeclaresAndModifiesWithDirectEq.kt"); doTest(fileName); } @TestMetadata("lambdaUsesOwnerModifies.kt") public void testLambdaUsesOwnerModifies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaUsesOwnerModifies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/lambdaUsesOwnerModifies.kt"); doTest(fileName); } @TestMetadata("localClassChanges.kt") public void testLocalClassChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localClassChanges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localClassChanges.kt"); doTest(fileName); } @TestMetadata("localFunBetween.kt") public void testLocalFunBetween() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localFunBetween.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localFunBetween.kt"); doTest(fileName); } @TestMetadata("localFunChanges.kt") public void testLocalFunChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt"); doTest(fileName); } @TestMetadata("localObjectChanges.kt") public void testLocalObjectChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localObjectChanges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/localObjectChanges.kt"); doTest(fileName); } @TestMetadata("noErrorCheckForPackageLevelVal.kt") public void testNoErrorCheckForPackageLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.kt"); doTest(fileName); } @TestMetadata("noUnnecessarySmartCastForReceiver.kt") public void testNoUnnecessarySmartCastForReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.kt"); doTest(fileName); } @TestMetadata("ownerDeclaresBothModifies.kt") public void testOwnerDeclaresBothModifies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/ownerDeclaresBothModifies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/ownerDeclaresBothModifies.kt"); doTest(fileName); } @TestMetadata("propertyToNotNull.kt") public void testPropertyToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt"); doTest(fileName); } @TestMetadata("thisWithLabel.kt") public void testThisWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.kt"); doTest(fileName); } @TestMetadata("thisWithLabelAsReceiverPart.kt") public void testThisWithLabelAsReceiverPart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.kt"); doTest(fileName); } @TestMetadata("varChangedInInitializer.kt") public void testVarChangedInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varChangedInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varChangedInInitializer.kt"); doTest(fileName); } @TestMetadata("varChangedInLocalInitializer.kt") public void testVarChangedInLocalInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varChangedInLocalInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varChangedInLocalInitializer.kt"); doTest(fileName); } @TestMetadata("varInAccessor.kt") public void testVarInAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInAccessor.kt"); doTest(fileName); } @TestMetadata("varInInitializer.kt") public void testVarInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInInitializer.kt"); doTest(fileName); } @TestMetadata("varInSecondaryConstructor.kt") public void testVarInSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInSecondaryConstructor.kt"); doTest(fileName); } @TestMetadata("varInsideLocalFun.kt") public void testVarInsideLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInsideLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varInsideLocalFun.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/inference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractJetDiagnosticsTest { + public static class Inference extends AbstractDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dependentOnPrevArg.kt") public void testDependentOnPrevArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.kt"); doTest(fileName); } @TestMetadata("intersectionTypes.kt") public void testIntersectionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt"); doTest(fileName); } @TestMetadata("kt1275.kt") public void testKt1275() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt1275.kt"); doTest(fileName); } @TestMetadata("kt1355.kt") public void testKt1355() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.kt"); doTest(fileName); } @TestMetadata("kt2746.kt") public void testKt2746() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.kt"); doTest(fileName); } @TestMetadata("kt2851.kt") public void testKt2851() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt"); doTest(fileName); } @TestMetadata("kt4009.kt") public void testKt4009() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.kt"); doTest(fileName); } @TestMetadata("kt4403.kt") public void testKt4403() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.kt"); doTest(fileName); } @TestMetadata("kt4415.kt") public void testKt4415() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt"); doTest(fileName); } @TestMetadata("kt6242.kt") public void testKt6242() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.kt"); doTest(fileName); } @TestMetadata("smartCastOnReceiver.kt") public void testSmartCastOnReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.kt"); doTest(fileName); } } @@ -14751,320 +14751,320 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/loops") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Loops extends AbstractJetDiagnosticsTest { + public static class Loops extends AbstractDiagnosticsTest { public void testAllFilesPresentInLoops() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/loops"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/loops"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignElvisIfBreakInsideWhileTrue.kt") public void testAssignElvisIfBreakInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/assignElvisIfBreakInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/assignElvisIfBreakInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("assignWhenInsideWhileTrue.kt") public void testAssignWhenInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/assignWhenInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/assignWhenInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("callBreakBetweenInsideDoWhile.kt") public void testCallBreakBetweenInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakBetweenInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakBetweenInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("callBreakFirstInsideDoWhile.kt") public void testCallBreakFirstInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakFirstInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakFirstInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("callBreakInsideDoWhile.kt") public void testCallBreakInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("callBreakSecondInsideDoWhile.kt") public void testCallBreakSecondInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakSecondInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakSecondInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("callBreakThirdInsideDoWhile.kt") public void testCallBreakThirdInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakThirdInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/callBreakThirdInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhile.kt"); doTest(fileName); } @TestMetadata("doWhileBreak.kt") public void testDoWhileBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileBreak.kt"); doTest(fileName); } @TestMetadata("doWhileContinue.kt") public void testDoWhileContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileContinue.kt"); doTest(fileName); } @TestMetadata("doWhileEarlyBreak.kt") public void testDoWhileEarlyBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileEarlyBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileEarlyBreak.kt"); doTest(fileName); } @TestMetadata("doWhileEarlyContinue.kt") public void testDoWhileEarlyContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileEarlyContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileEarlyContinue.kt"); doTest(fileName); } @TestMetadata("doWhileInCondition.kt") public void testDoWhileInCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileInCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileInCondition.kt"); doTest(fileName); } @TestMetadata("doWhileInConditionWithBreak.kt") public void testDoWhileInConditionWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileInConditionWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileInConditionWithBreak.kt"); doTest(fileName); } @TestMetadata("doWhileLiteral.kt") public void testDoWhileLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileLiteral.kt"); doTest(fileName); } @TestMetadata("doWhileNotNullBreak.kt") public void testDoWhileNotNullBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNotNullBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNotNullBreak.kt"); doTest(fileName); } @TestMetadata("doWhileNull.kt") public void testDoWhileNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNull.kt"); doTest(fileName); } @TestMetadata("doWhileNullWithBreak.kt") public void testDoWhileNullWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNullWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/doWhileNullWithBreak.kt"); doTest(fileName); } @TestMetadata("elvisBreakInsideDoWhile.kt") public void testElvisBreakInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisBreakInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisBreakInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("elvisIfBreakInsideWhileTrue.kt") public void testElvisIfBreakInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisIfBreakInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisIfBreakInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("elvisInsideDoWhile.kt") public void testElvisInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("elvisLeftBreakInsideWhileTrue.kt") public void testElvisLeftBreakInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisLeftBreakInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/elvisLeftBreakInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("ifBlockInsideDoWhile.kt") public void testIfBlockInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBlockInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBlockInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("ifBreakAssignInsideDoWhile.kt") public void testIfBreakAssignInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakAssignInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakAssignInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("ifBreakAssignInsideWhileTrue.kt") public void testIfBreakAssignInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakAssignInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakAssignInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("ifBreakExprInsideWhileTrue.kt") public void testIfBreakExprInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakExprInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifBreakExprInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("ifElseBlockInsideDoWhile.kt") public void testIfElseBlockInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifElseBlockInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifElseBlockInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("ifInsideDoWhile.kt") public void testIfInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/ifInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("leftElvisBreakInsideWhileTrue.kt") public void testLeftElvisBreakInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/leftElvisBreakInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/leftElvisBreakInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("nestedDoWhile.kt") public void testNestedDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedDoWhile.kt"); doTest(fileName); } @TestMetadata("nestedDoWhileWithLongContinue.kt") public void testNestedDoWhileWithLongContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedDoWhileWithLongContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedDoWhileWithLongContinue.kt"); doTest(fileName); } @TestMetadata("nestedLoops.kt") public void testNestedLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoops.kt"); doTest(fileName); } @TestMetadata("nestedLoopsShort.kt") public void testNestedLoopsShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsShort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsShort.kt"); doTest(fileName); } @TestMetadata("nestedLoopsWithBreak.kt") public void testNestedLoopsWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithBreak.kt"); doTest(fileName); } @TestMetadata("nestedLoopsWithLongBreak.kt") public void testNestedLoopsWithLongBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithLongBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithLongBreak.kt"); doTest(fileName); } @TestMetadata("nestedLoopsWithLongContinue.kt") public void testNestedLoopsWithLongContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithLongContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/nestedLoopsWithLongContinue.kt"); doTest(fileName); } @TestMetadata("plusAssignWhenInsideDoWhile.kt") public void testPlusAssignWhenInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/plusAssignWhenInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/plusAssignWhenInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("safeCallBreakInsideDoWhile.kt") public void testSafeCallBreakInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/safeCallBreakInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/safeCallBreakInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("safeCallInsideDoWhile.kt") public void testSafeCallInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/safeCallInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/safeCallInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("useInsideDoWhile.kt") public void testUseInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/useInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/useInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("whenInsideWhileTrue.kt") public void testWhenInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whenInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whenInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("whenReturnInsideWhileTrue.kt") public void testWhenReturnInsideWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whenReturnInsideWhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whenReturnInsideWhileTrue.kt"); doTest(fileName); } @TestMetadata("whileInCondition.kt") public void testWhileInCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileInCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileInCondition.kt"); doTest(fileName); } @TestMetadata("whileInConditionWithBreak.kt") public void testWhileInConditionWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileInConditionWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileInConditionWithBreak.kt"); doTest(fileName); } @TestMetadata("whileNull.kt") public void testWhileNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileNull.kt"); doTest(fileName); } @TestMetadata("whileNullWithBreak.kt") public void testWhileNullWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileNullWithBreak.kt"); doTest(fileName); } @TestMetadata("whileSimple.kt") public void testWhileSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileSimple.kt"); doTest(fileName); } @TestMetadata("whileTrivial.kt") public void testWhileTrivial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrivial.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrivial.kt"); doTest(fileName); } @TestMetadata("whileTrue.kt") public void testWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrue.kt"); doTest(fileName); } @TestMetadata("whileTrueBreakReturn.kt") public void testWhileTrueBreakReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueBreakReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueBreakReturn.kt"); doTest(fileName); } @TestMetadata("whileTrueEarlyBreak.kt") public void testWhileTrueEarlyBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueEarlyBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueEarlyBreak.kt"); doTest(fileName); } @TestMetadata("whileTrueReturn.kt") public void testWhileTrueReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/loops/whileTrueReturn.kt"); doTest(fileName); } } @@ -15072,56 +15072,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ObjectLiterals extends AbstractJetDiagnosticsTest { + public static class ObjectLiterals extends AbstractDiagnosticsTest { public void testAllFilesPresentInObjectLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/objectLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/objectLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/assignment.kt"); doTest(fileName); } @TestMetadata("base.kt") public void testBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/base.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/base.kt"); doTest(fileName); } @TestMetadata("captured.kt") public void testCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt"); doTest(fileName); } @TestMetadata("exclexcl.kt") public void testExclexcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt"); doTest(fileName); } @TestMetadata("exclexclArgument.kt") public void testExclexclArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclArgument.kt"); doTest(fileName); } @TestMetadata("exclexclTwoArgument.kt") public void testExclexclTwoArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexclTwoArgument.kt"); doTest(fileName); } @TestMetadata("kt7110.kt") public void testKt7110() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/kt7110.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/kt7110.kt"); doTest(fileName); } @TestMetadata("receiver.kt") public void testReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/receiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/objectLiterals/receiver.kt"); doTest(fileName); } } @@ -15129,62 +15129,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PublicVals extends AbstractJetDiagnosticsTest { + public static class PublicVals extends AbstractDiagnosticsTest { public void testAllFilesPresentInPublicVals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/publicVals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/publicVals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("customGetter.kt") public void testCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/customGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/customGetter.kt"); doTest(fileName); } @TestMetadata("delegate.kt") public void testDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt"); doTest(fileName); } @TestMetadata("kt4409.kt") public void testKt4409() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/kt4409.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/kt4409.kt"); doTest(fileName); } @TestMetadata("kt5502.kt") public void testKt5502() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/kt5502.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/kt5502.kt"); doTest(fileName); } @TestMetadata("open.kt") public void testOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/open.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/open.kt"); doTest(fileName); } @TestMetadata("otherModule.kt") public void testOtherModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.kt"); doTest(fileName); } @TestMetadata("protected.kt") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/protected.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/simple.kt"); doTest(fileName); } @TestMetadata("var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVals/var.kt"); doTest(fileName); } } @@ -15192,140 +15192,140 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Safecalls extends AbstractJetDiagnosticsTest { + public static class Safecalls extends AbstractDiagnosticsTest { public void testAllFilesPresentInSafecalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/safecalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/safecalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anotherVal.kt") public void testAnotherVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt"); doTest(fileName); } @TestMetadata("argument.kt") public void testArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.kt"); doTest(fileName); } @TestMetadata("chainAndUse.kt") public void testChainAndUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.kt"); doTest(fileName); } @TestMetadata("chainInChain.kt") public void testChainInChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.kt"); doTest(fileName); } @TestMetadata("chainMixedUnsafe.kt") public void testChainMixedUnsafe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.kt"); doTest(fileName); } @TestMetadata("doubleCall.kt") public void testDoubleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/extension.kt"); doTest(fileName); } @TestMetadata("extensionCall.kt") public void testExtensionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/extensionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/extensionCall.kt"); doTest(fileName); } @TestMetadata("falseArgument.kt") public void testFalseArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.kt"); doTest(fileName); } @TestMetadata("falseChain.kt") public void testFalseChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.kt"); doTest(fileName); } @TestMetadata("falseExtension.kt") public void testFalseExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.kt"); doTest(fileName); } @TestMetadata("falseSecondArgument.kt") public void testFalseSecondArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt"); doTest(fileName); } @TestMetadata("innerReceiver.kt") public void testInnerReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/innerReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/innerReceiver.kt"); doTest(fileName); } @TestMetadata("insideCall.kt") public void testInsideCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.kt"); doTest(fileName); } @TestMetadata("longChain.kt") public void testLongChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/property.kt"); doTest(fileName); } @TestMetadata("propertyChain.kt") public void testPropertyChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/propertyChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/propertyChain.kt"); doTest(fileName); } @TestMetadata("receiver.kt") public void testReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiver.kt"); doTest(fileName); } @TestMetadata("receiverAndChain.kt") public void testReceiverAndChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChain.kt"); doTest(fileName); } @TestMetadata("receiverAndChainFalse.kt") public void testReceiverAndChainFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.kt"); doTest(fileName); } @TestMetadata("twoArgs.kt") public void testTwoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.kt"); doTest(fileName); } } @@ -15333,152 +15333,152 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/variables") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Variables extends AbstractJetDiagnosticsTest { + public static class Variables extends AbstractDiagnosticsTest { @TestMetadata("accessorAndFunction.kt") public void testAccessorAndFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/accessorAndFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/accessorAndFunction.kt"); doTest(fileName); } public void testAllFilesPresentInVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/variables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/variables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/assignment.kt"); doTest(fileName); } @TestMetadata("assignmentConversion.kt") public void testAssignmentConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/assignmentConversion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/assignmentConversion.kt"); doTest(fileName); } @TestMetadata("doWhileWithMiddleBreak.kt") public void testDoWhileWithMiddleBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/doWhileWithMiddleBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/doWhileWithMiddleBreak.kt"); doTest(fileName); } @TestMetadata("ifElseBlockInsideDoWhile.kt") public void testIfElseBlockInsideDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifElseBlockInsideDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifElseBlockInsideDoWhile.kt"); doTest(fileName); } @TestMetadata("ifElseBlockInsideDoWhileWithBreak.kt") public void testIfElseBlockInsideDoWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifElseBlockInsideDoWhileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifElseBlockInsideDoWhileWithBreak.kt"); doTest(fileName); } @TestMetadata("ifVarIs.kt") public void testIfVarIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIs.kt"); doTest(fileName); } @TestMetadata("ifVarIsAnd.kt") public void testIfVarIsAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIsAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIsAnd.kt"); doTest(fileName); } @TestMetadata("ifVarIsChanged.kt") public void testIfVarIsChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIsChanged.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/ifVarIsChanged.kt"); doTest(fileName); } @TestMetadata("inPropertySam.kt") public void testInPropertySam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/inPropertySam.kt"); doTest(fileName); } @TestMetadata("infix.kt") public void testInfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/infix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/infix.kt"); doTest(fileName); } @TestMetadata("initialization.kt") public void testInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/initialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/initialization.kt"); doTest(fileName); } @TestMetadata("kt7599.kt") public void testKt7599() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/kt7599.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/kt7599.kt"); doTest(fileName); } @TestMetadata("lambdaBetweenArguments.kt") public void testLambdaBetweenArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/property.kt"); doTest(fileName); } @TestMetadata("propertyNotNeeded.kt") public void testPropertyNotNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertyNotNeeded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertyNotNeeded.kt"); doTest(fileName); } @TestMetadata("propertySubtype.kt") public void testPropertySubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtype.kt"); doTest(fileName); } @TestMetadata("propertySubtypeInMember.kt") public void testPropertySubtypeInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtypeInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtypeInMember.kt"); doTest(fileName); } @TestMetadata("propertySubtypeInMemberCheck.kt") public void testPropertySubtypeInMemberCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtypeInMemberCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/propertySubtypeInMemberCheck.kt"); doTest(fileName); } @TestMetadata("varAsUse.kt") public void testVarAsUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varAsUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varAsUse.kt"); doTest(fileName); } @TestMetadata("varChangedInLoop.kt") public void testVarChangedInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varChangedInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varChangedInLoop.kt"); doTest(fileName); } @TestMetadata("varNotChangedInLoop.kt") public void testVarNotChangedInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varNotChangedInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/varNotChangedInLoop.kt"); doTest(fileName); } @TestMetadata("whileTrue.kt") public void testWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/whileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/whileTrue.kt"); doTest(fileName); } @TestMetadata("whileWithBreak.kt") public void testWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/whileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/variables/whileWithBreak.kt"); doTest(fileName); } } @@ -15486,248 +15486,248 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Varnotnull extends AbstractJetDiagnosticsTest { + public static class Varnotnull extends AbstractDiagnosticsTest { public void testAllFilesPresentInVarnotnull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/varnotnull"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/varnotnull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignNestedWhile.kt") public void testAssignNestedWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignNestedWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignNestedWhile.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt"); doTest(fileName); } @TestMetadata("doWhileWithBreak.kt") public void testDoWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithBreak.kt"); doTest(fileName); } @TestMetadata("doWhileWithMiddleBreak.kt") public void testDoWhileWithMiddleBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithMiddleBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/doWhileWithMiddleBreak.kt"); doTest(fileName); } @TestMetadata("forEach.kt") public void testForEach() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt"); doTest(fileName); } @TestMetadata("forEachWithBreak.kt") public void testForEachWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt"); doTest(fileName); } @TestMetadata("forEachWithContinue.kt") public void testForEachWithContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt"); doTest(fileName); } @TestMetadata("ifVarNotNull.kt") public void testIfVarNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNull.kt"); doTest(fileName); } @TestMetadata("ifVarNotNullAnd.kt") public void testIfVarNotNullAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNullAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNotNullAnd.kt"); doTest(fileName); } @TestMetadata("ifVarNullElse.kt") public void testIfVarNullElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNullElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNullElse.kt"); doTest(fileName); } @TestMetadata("ifVarNullReturn.kt") public void testIfVarNullReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNullReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/ifVarNullReturn.kt"); doTest(fileName); } @TestMetadata("inference.kt") public void testInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/inference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/inference.kt"); doTest(fileName); } @TestMetadata("infiniteWhileWithBreak.kt") public void testInfiniteWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/infiniteWhileWithBreak.kt"); doTest(fileName); } @TestMetadata("infix.kt") public void testInfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/infix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/infix.kt"); doTest(fileName); } @TestMetadata("initialization.kt") public void testInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt"); doTest(fileName); } @TestMetadata("iterations.kt") public void testIterations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/iterations.kt"); doTest(fileName); } @TestMetadata("nestedDoWhile.kt") public void testNestedDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedDoWhile.kt"); doTest(fileName); } @TestMetadata("nestedLoops.kt") public void testNestedLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedLoops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedLoops.kt"); doTest(fileName); } @TestMetadata("nestedWhile.kt") public void testNestedWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/nestedWhile.kt"); doTest(fileName); } @TestMetadata("postfixNotnullClassIncrement.kt") public void testPostfixNotnullClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt"); doTest(fileName); } @TestMetadata("postfixNullableClassIncrement.kt") public void testPostfixNullableClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableClassIncrement.kt"); doTest(fileName); } @TestMetadata("postfixNullableIncrement.kt") public void testPostfixNullableIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNullableIncrement.kt"); doTest(fileName); } @TestMetadata("prefixNotnullClassIncrement.kt") public void testPrefixNotnullClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt"); doTest(fileName); } @TestMetadata("prefixNullableClassIncrement.kt") public void testPrefixNullableClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableClassIncrement.kt"); doTest(fileName); } @TestMetadata("prefixNullableIncrement.kt") public void testPrefixNullableIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNullableIncrement.kt"); doTest(fileName); } @TestMetadata("unnecessary.kt") public void testUnnecessary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessary.kt"); doTest(fileName); } @TestMetadata("unnecessaryWithBranch.kt") public void testUnnecessaryWithBranch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithBranch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithBranch.kt"); doTest(fileName); } @TestMetadata("unnecessaryWithMap.kt") public void testUnnecessaryWithMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt"); doTest(fileName); } @TestMetadata("varCapturedInClosure.kt") public void testVarCapturedInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInClosure.kt"); doTest(fileName); } @TestMetadata("varCapturedInInlineClosure.kt") public void testVarCapturedInInlineClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt"); doTest(fileName); } @TestMetadata("varCapturedInSafeClosure.kt") public void testVarCapturedInSafeClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInSafeClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInSafeClosure.kt"); doTest(fileName); } @TestMetadata("varChangedInLoop.kt") public void testVarChangedInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varChangedInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varChangedInLoop.kt"); doTest(fileName); } @TestMetadata("varCheck.kt") public void testVarCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCheck.kt"); doTest(fileName); } @TestMetadata("varIntNull.kt") public void testVarIntNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt"); doTest(fileName); } @TestMetadata("varNotChangedInLoop.kt") public void testVarNotChangedInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNotChangedInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNotChangedInLoop.kt"); doTest(fileName); } @TestMetadata("varNull.kt") public void testVarNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt"); doTest(fileName); } @TestMetadata("whileTrue.kt") public void testWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrue.kt"); doTest(fileName); } @TestMetadata("whileTrueWithBracketSet.kt") public void testWhileTrueWithBracketSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrueWithBracketSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrueWithBracketSet.kt"); doTest(fileName); } @TestMetadata("whileTrueWithBrackets.kt") public void testWhileTrueWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrueWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileTrueWithBrackets.kt"); doTest(fileName); } @TestMetadata("whileWithBreak.kt") public void testWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/varnotnull/whileWithBreak.kt"); doTest(fileName); } } @@ -15736,38 +15736,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/substitutions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Substitutions extends AbstractJetDiagnosticsTest { + public static class Substitutions extends AbstractDiagnosticsTest { public void testAllFilesPresentInSubstitutions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/substitutions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/substitutions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1558-short.kt") public void testKt1558_short() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt"); doTest(fileName); } @TestMetadata("kt4887.kt") public void testKt4887() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt4887.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt4887.kt"); doTest(fileName); } @TestMetadata("starProjections.kt") public void testStarProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/starProjections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/starProjections.kt"); doTest(fileName); } @TestMetadata("upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt") public void testUpperBoundsSubstitutionForOverloadResolutionWithAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt"); doTest(fileName); } @TestMetadata("upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt") public void testUpperBoundsSubstitutionForOverloadResolutionWithErrorTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt"); doTest(fileName); } } @@ -15775,104 +15775,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/subtyping") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Subtyping extends AbstractJetDiagnosticsTest { + public static class Subtyping extends AbstractDiagnosticsTest { public void testAllFilesPresentInSubtyping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("extFunctionTypeAsSuperType.kt") public void testExtFunctionTypeAsSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/extFunctionTypeAsSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/extFunctionTypeAsSuperType.kt"); doTest(fileName); } @TestMetadata("findClosestCorrespondingSupertype.kt") public void testFindClosestCorrespondingSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/findClosestCorrespondingSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/findClosestCorrespondingSupertype.kt"); doTest(fileName); } @TestMetadata("functionTypeAsSuperType.kt") public void testFunctionTypeAsSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/functionTypeAsSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/functionTypeAsSuperType.kt"); doTest(fileName); } @TestMetadata("invariantArgumentForTypeParameterWithMultipleBounds.kt") public void testInvariantArgumentForTypeParameterWithMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/invariantArgumentForTypeParameterWithMultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/invariantArgumentForTypeParameterWithMultipleBounds.kt"); doTest(fileName); } @TestMetadata("kt2069.kt") public void testKt2069() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2069.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2069.kt"); doTest(fileName); } @TestMetadata("kt2744.kt") public void testKt2744() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2744.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2744.kt"); doTest(fileName); } @TestMetadata("kt304.kt") public void testKt304() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt304.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt304.kt"); doTest(fileName); } @TestMetadata("kt3159.kt") public void testKt3159() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt3159.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt3159.kt"); doTest(fileName); } @TestMetadata("kt-1457.kt") public void testKt_1457() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt"); doTest(fileName); } @TestMetadata("localAnonymousObjects.kt") public void testLocalAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.kt"); doTest(fileName); } @TestMetadata("localClasses.kt") public void testLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localClasses.kt"); doTest(fileName); } @TestMetadata("memberAnonymousObjects.kt") public void testMemberAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.kt"); doTest(fileName); } @TestMetadata("nestedIntoLocalClasses.kt") public void testNestedIntoLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt"); doTest(fileName); } @TestMetadata("nestedLocalClasses.kt") public void testNestedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt"); doTest(fileName); } @TestMetadata("topLevelAnonymousObjects.kt") public void testTopLevelAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.kt"); doTest(fileName); } @TestMetadata("unresolvedSupertype.kt") public void testUnresolvedSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/unresolvedSupertype.kt"); doTest(fileName); } } @@ -15880,64 +15880,64 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Suppress extends AbstractJetDiagnosticsTest { + public static class Suppress extends AbstractDiagnosticsTest { public void testAllFilesPresentInSuppress() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AllWarnings extends AbstractJetDiagnosticsTest { + public static class AllWarnings extends AbstractDiagnosticsTest { public void testAllFilesPresentInAllWarnings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("suppressWarningsOnClass.kt") public void testSuppressWarningsOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnClassObject.kt") public void testSuppressWarningsOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnExpression.kt") public void testSuppressWarningsOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnFunction.kt") public void testSuppressWarningsOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnObject.kt") public void testSuppressWarningsOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnParameter.kt") public void testSuppressWarningsOnParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnProperty.kt") public void testSuppressWarningsOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.kt"); doTest(fileName); } @TestMetadata("suppressWarningsOnPropertyAccessor.kt") public void testSuppressWarningsOnPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.kt"); doTest(fileName); } } @@ -15945,62 +15945,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ManyWarnings extends AbstractJetDiagnosticsTest { + public static class ManyWarnings extends AbstractDiagnosticsTest { public void testAllFilesPresentInManyWarnings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/manyWarnings"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/manyWarnings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mixed.kt") public void testMixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.kt"); doTest(fileName); } @TestMetadata("onClass.kt") public void testOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.kt"); doTest(fileName); } @TestMetadata("onClassObject.kt") public void testOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt"); doTest(fileName); } @TestMetadata("onExpression.kt") public void testOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.kt"); doTest(fileName); } @TestMetadata("onFunction.kt") public void testOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.kt"); doTest(fileName); } @TestMetadata("onObject.kt") public void testOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.kt"); doTest(fileName); } @TestMetadata("onParameter.kt") public void testOnParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.kt"); doTest(fileName); } @TestMetadata("onProperty.kt") public void testOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.kt"); doTest(fileName); } @TestMetadata("onPropertyAccessor.kt") public void testOnPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.kt"); doTest(fileName); } } @@ -16008,62 +16008,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OneWarning extends AbstractJetDiagnosticsTest { + public static class OneWarning extends AbstractDiagnosticsTest { public void testAllFilesPresentInOneWarning() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/oneWarning"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/oneWarning"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("onClass.kt") public void testOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.kt"); doTest(fileName); } @TestMetadata("onClassObject.kt") public void testOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt"); doTest(fileName); } @TestMetadata("onExpression.kt") public void testOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.kt"); doTest(fileName); } @TestMetadata("onFunction.kt") public void testOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.kt"); doTest(fileName); } @TestMetadata("onLocalVariable.kt") public void testOnLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.kt"); doTest(fileName); } @TestMetadata("onObject.kt") public void testOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.kt"); doTest(fileName); } @TestMetadata("onParameter.kt") public void testOnParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.kt"); doTest(fileName); } @TestMetadata("onProperty.kt") public void testOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.kt"); doTest(fileName); } @TestMetadata("onPropertyAccessor.kt") public void testOnPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.kt"); doTest(fileName); } } @@ -16072,184 +16072,184 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/syntheticExtensions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SyntheticExtensions extends AbstractJetDiagnosticsTest { + public static class SyntheticExtensions extends AbstractDiagnosticsTest { public void testAllFilesPresentInSyntheticExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaProperties extends AbstractJetDiagnosticsTest { + public static class JavaProperties extends AbstractDiagnosticsTest { @TestMetadata("AbbreviationName.kt") public void testAbbreviationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/AbbreviationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/AbbreviationName.kt"); doTest(fileName); } public void testAllFilesPresentInJavaProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Bases.kt") public void testBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt"); doTest(fileName); } @TestMetadata("CompiledClass.kt") public void testCompiledClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/CompiledClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/CompiledClass.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Deprecated.kt"); doTest(fileName); } @TestMetadata("FalseGetters.kt") public void testFalseGetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FalseGetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FalseGetters.kt"); doTest(fileName); } @TestMetadata("FalseSetters.kt") public void testFalseSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FalseSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FalseSetters.kt"); doTest(fileName); } @TestMetadata("FromTwoBases.kt") public void testFromTwoBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FromTwoBases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/FromTwoBases.kt"); doTest(fileName); } @TestMetadata("GenericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GenericClass.kt"); doTest(fileName); } @TestMetadata("GetA.kt") public void testGetA() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GetA.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GetA.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt"); doTest(fileName); } @TestMetadata("GetterAndSetter.kt") public void testGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/GetterAndSetter.kt"); doTest(fileName); } @TestMetadata("ImplicitReceiver.kt") public void testImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/ImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/ImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("IsNaming.kt") public void testIsNaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/IsNaming.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/IsNaming.kt"); doTest(fileName); } @TestMetadata("JavaOverridesKotlin.kt") public void testJavaOverridesKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/JavaOverridesKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/JavaOverridesKotlin.kt"); doTest(fileName); } @TestMetadata("KotlinOverridesJava.kt") public void testKotlinOverridesJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava.kt"); doTest(fileName); } @TestMetadata("KotlinOverridesJava2.kt") public void testKotlinOverridesJava2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava2.kt"); doTest(fileName); } @TestMetadata("KotlinOverridesJava3.kt") public void testKotlinOverridesJava3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava3.kt"); doTest(fileName); } @TestMetadata("KotlinOverridesJava4.kt") public void testKotlinOverridesJava4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava4.kt"); doTest(fileName); } @TestMetadata("KotlinOverridesJava5.kt") public void testKotlinOverridesJava5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/KotlinOverridesJava5.kt"); doTest(fileName); } @TestMetadata("OnlyAscii.kt") public void testOnlyAscii() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyAscii.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyAscii.kt"); doTest(fileName); } @TestMetadata("OnlyPublic.kt") public void testOnlyPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt"); doTest(fileName); } @TestMetadata("OverrideGetterOnly.kt") public void testOverrideGetterOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OverrideGetterOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OverrideGetterOnly.kt"); doTest(fileName); } @TestMetadata("SetterHasHigherAccess.kt") public void testSetterHasHigherAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt"); doTest(fileName); } @TestMetadata("SetterOnly.kt") public void testSetterOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterOnly.kt"); doTest(fileName); } @TestMetadata("SmartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SmartCast.kt"); doTest(fileName); } @TestMetadata("SmartCastImplicitReceiver.kt") public void testSmartCastImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SmartCastImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SmartCastImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("TypeAnnotation.kt") public void testTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeAnnotation.kt"); doTest(fileName); } @TestMetadata("TypeParameterReceiver.kt") public void testTypeParameterReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeParameterReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/TypeParameterReceiver.kt"); doTest(fileName); } } @@ -16257,86 +16257,86 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SamAdapters extends AbstractJetDiagnosticsTest { + public static class SamAdapters extends AbstractDiagnosticsTest { public void testAllFilesPresentInSamAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Deprecated.kt"); doTest(fileName); } @TestMetadata("GenericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericClass.kt"); doTest(fileName); } @TestMetadata("GenericMethod.kt") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt"); doTest(fileName); } @TestMetadata("GenericMethodInGenericClass.kt") public void testGenericMethodInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt"); doTest(fileName); } @TestMetadata("InnerClassInGeneric.kt") public void testInnerClassInGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt"); doTest(fileName); } @TestMetadata("NoNamedArgsAllowed.kt") public void testNoNamedArgsAllowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt"); doTest(fileName); } @TestMetadata("PackageLocal.kt") public void testPackageLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt"); doTest(fileName); } @TestMetadata("ParameterTypeAnnotation.kt") public void testParameterTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("PassNull.kt") public void testPassNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PassNull.kt"); doTest(fileName); } @TestMetadata("Private.kt") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt"); doTest(fileName); } @TestMetadata("Protected.kt") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Protected.kt"); doTest(fileName); } @TestMetadata("ReturnTypeAnnotation.kt") public void testReturnTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ReturnTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ReturnTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Simple.kt"); doTest(fileName); } } @@ -16345,166 +16345,166 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ThisAndSuper extends AbstractJetDiagnosticsTest { + public static class ThisAndSuper extends AbstractDiagnosticsTest { public void testAllFilesPresentInThisAndSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambigousLabelOnThis.kt") public void testAmbigousLabelOnThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.kt"); doTest(fileName); } @TestMetadata("notAccessibleSuperInTrait.kt") public void testNotAccessibleSuperInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.kt"); doTest(fileName); } @TestMetadata("QualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.kt"); doTest(fileName); } @TestMetadata("Super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/Super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/Super.kt"); doTest(fileName); } @TestMetadata("superInExtensionFunction.kt") public void testSuperInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.kt"); doTest(fileName); } @TestMetadata("superInExtensionFunctionCall.kt") public void testSuperInExtensionFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt"); doTest(fileName); } @TestMetadata("superInToplevelFunction.kt") public void testSuperInToplevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.kt"); doTest(fileName); } @TestMetadata("superIsNotAnExpression.kt") public void testSuperIsNotAnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.kt"); doTest(fileName); } @TestMetadata("thisInFunctionLiterals.kt") public void testThisInFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("thisInInnerClasses.kt") public void testThisInInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.kt"); doTest(fileName); } @TestMetadata("thisInPropertyInitializer.kt") public void testThisInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("thisInToplevelFunction.kt") public void testThisInToplevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.kt"); doTest(fileName); } @TestMetadata("traitSuperCall.kt") public void testTraitSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/traitSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/traitSuperCall.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnqualifiedSuper extends AbstractJetDiagnosticsTest { + public static class UnqualifiedSuper extends AbstractDiagnosticsTest { public void testAllFilesPresentInUnqualifiedSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambiguousSuperWithGenerics.kt") public void testAmbiguousSuperWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuper.kt") public void testUnqualifiedSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuper.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithAbstractMembers.kt") public void testUnqualifiedSuperWithAbstractMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithAbstractMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithAbstractMembers.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithCallableProperty.kt") public void testUnqualifiedSuperWithCallableProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithDeeperHierarchies.kt") public void testUnqualifiedSuperWithDeeperHierarchies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithDeeperHierarchies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithDeeperHierarchies.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithGenerics.kt") public void testUnqualifiedSuperWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithGenerics.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithInnerClass.kt") public void testUnqualifiedSuperWithInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInnerClass.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithInterfaces.kt") public void testUnqualifiedSuperWithInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithInterfaces.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithLocalClass.kt") public void testUnqualifiedSuperWithLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithLocalClass.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithUnresolvedBase.kt") public void testUnqualifiedSuperWithUnresolvedBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithUnresolvedBase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithUnresolvedBase.kt"); doTest(fileName); } @TestMetadata("withMethodOfAnyOverridenInInterface.kt") public void testWithMethodOfAnyOverridenInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/withMethodOfAnyOverridenInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/withMethodOfAnyOverridenInInterface.kt"); doTest(fileName); } @TestMetadata("withMethodsOfAny.kt") public void testWithMethodsOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/withMethodsOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/withMethodsOfAny.kt"); doTest(fileName); } } @@ -16513,20 +16513,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/traitWithRequired") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TraitWithRequired extends AbstractJetDiagnosticsTest { + public static class TraitWithRequired extends AbstractDiagnosticsTest { public void testAllFilesPresentInTraitWithRequired() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/traitWithRequired"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/traitWithRequired"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("traitRequiresAny.kt") public void testTraitRequiresAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.kt"); doTest(fileName); } @TestMetadata("traitSupertypeList.kt") public void testTraitSupertypeList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.kt"); doTest(fileName); } } @@ -16534,32 +16534,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameters extends AbstractJetDiagnosticsTest { + public static class TypeParameters extends AbstractDiagnosticsTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deprecatedSyntax.kt") public void testDeprecatedSyntax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/deprecatedSyntax.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/deprecatedSyntax.kt"); doTest(fileName); } @TestMetadata("misplacedConstraints.kt") public void testMisplacedConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/misplacedConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/misplacedConstraints.kt"); doTest(fileName); } @TestMetadata("propertyTypeParameters.kt") public void testPropertyTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.kt"); doTest(fileName); } @TestMetadata("upperBoundCannotBeArray.kt") public void testUpperBoundCannotBeArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typeParameters/upperBoundCannotBeArray.kt"); doTest(fileName); } } @@ -16567,14 +16567,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/typedefs") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Typedefs extends AbstractJetDiagnosticsTest { + public static class Typedefs extends AbstractDiagnosticsTest { public void testAllFilesPresentInTypedefs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typedefs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typedefs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("TypedefsUnsupported.kt") public void testTypedefsUnsupported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt"); doTest(fileName); } } @@ -16582,14 +16582,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/unit") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Unit extends AbstractJetDiagnosticsTest { + public static class Unit extends AbstractDiagnosticsTest { public void testAllFilesPresentInUnit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/unit"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/unit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nullableUnit.kt") public void testNullableUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/unit/nullableUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/unit/nullableUnit.kt"); doTest(fileName); } } @@ -16597,104 +16597,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/varargs") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractJetDiagnosticsTest { + public static class Varargs extends AbstractDiagnosticsTest { public void testAllFilesPresentInVarargs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/varargs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/varargs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguousVararg.kt") public void testAmbiguousVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt"); doTest(fileName); } @TestMetadata("kt1781.kt") public void testKt1781() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1781.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1781.kt"); doTest(fileName); } @TestMetadata("kt1835.kt") public void testKt1835() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1835.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1835.kt"); doTest(fileName); } @TestMetadata("kt1838-param.kt") public void testKt1838_param() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-param.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-param.kt"); doTest(fileName); } @TestMetadata("kt1838-val.kt") public void testKt1838_val() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-val.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-val.kt"); doTest(fileName); } @TestMetadata("kt2163.kt") public void testKt2163() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt2163.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt2163.kt"); doTest(fileName); } @TestMetadata("kt422.kt") public void testKt422() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt422.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt422.kt"); doTest(fileName); } @TestMetadata("MoreSpecificVarargsOfEqualLength.kt") public void testMoreSpecificVarargsOfEqualLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.kt"); doTest(fileName); } @TestMetadata("MostSepcificVarargsWithJava.kt") public void testMostSepcificVarargsWithJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt"); doTest(fileName); } @TestMetadata("NilaryVsVararg.kt") public void testNilaryVsVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.kt"); doTest(fileName); } @TestMetadata("UnaryVsVararg.kt") public void testUnaryVsVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.kt"); doTest(fileName); } @TestMetadata("varargIterator.kt") public void testVarargIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargIterator.kt"); doTest(fileName); } @TestMetadata("varargsAndFunctionLiterals.kt") public void testVarargsAndFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("varargsAndOut1.kt") public void testVarargsAndOut1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndOut1.kt"); doTest(fileName); } @TestMetadata("varargsAndOut2.kt") public void testVarargsAndOut2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndOut2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndOut2.kt"); doTest(fileName); } @TestMetadata("varargsAndPair.kt") public void testVarargsAndPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndPair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndPair.kt"); doTest(fileName); } } @@ -16702,112 +16702,112 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/variance") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Variance extends AbstractJetDiagnosticsTest { + public static class Variance extends AbstractDiagnosticsTest { public void testAllFilesPresentInVariance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/variance"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/variance"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Class.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Function.kt"); doTest(fileName); } @TestMetadata("FunctionTypes.kt") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/FunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/FunctionTypes.kt"); doTest(fileName); } @TestMetadata("InPosition.kt") public void testInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/InPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/InPosition.kt"); doTest(fileName); } @TestMetadata("InvariantPosition.kt") public void testInvariantPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/InvariantPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/InvariantPosition.kt"); doTest(fileName); } @TestMetadata("NullableTypes.kt") public void testNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/NullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/NullableTypes.kt"); doTest(fileName); } @TestMetadata("OutPosition.kt") public void testOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/OutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/OutPosition.kt"); doTest(fileName); } @TestMetadata("PrimaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt"); doTest(fileName); } @TestMetadata("ValProperty.kt") public void testValProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/ValProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/ValProperty.kt"); doTest(fileName); } @TestMetadata("VarProperty.kt") public void testVarProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/VarProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/VarProperty.kt"); doTest(fileName); } @TestMetadata("Visibility.kt") public void testVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Visibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/Visibility.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/tests/variance/privateToThis") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrivateToThis extends AbstractJetDiagnosticsTest { + public static class PrivateToThis extends AbstractDiagnosticsTest { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/Abstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/Abstract.kt"); doTest(fileName); } public void testAllFilesPresentInPrivateToThis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/variance/privateToThis"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/variance/privateToThis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunctionCall.kt") public void testFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt"); doTest(fileName); } @TestMetadata("GetVal.kt") public void testGetVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt"); doTest(fileName); } @TestMetadata("SetVar.kt") public void testSetVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt"); doTest(fileName); } @TestMetadata("ValReassigned.kt") public void testValReassigned() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/ValReassigned.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/variance/privateToThis/ValReassigned.kt"); doTest(fileName); } } @@ -16816,272 +16816,272 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/when") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class When extends AbstractJetDiagnosticsTest { + public static class When extends AbstractDiagnosticsTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedWhenStatement.kt") public void testAnnotatedWhenStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt"); doTest(fileName); } @TestMetadata("BranchBypassVal.kt") public void testBranchBypassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchBypassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchBypassVal.kt"); doTest(fileName); } @TestMetadata("BranchBypassVar.kt") public void testBranchBypassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchBypassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchBypassVar.kt"); doTest(fileName); } @TestMetadata("BranchFalseBypass.kt") public void testBranchFalseBypass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchFalseBypass.kt"); doTest(fileName); } @TestMetadata("BranchFalseBypassElse.kt") public void testBranchFalseBypassElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.kt"); doTest(fileName); } @TestMetadata("ElseOnNullableEnum.kt") public void testElseOnNullableEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.kt"); doTest(fileName); } @TestMetadata("ElseOnNullableEnumWithSmartCast.kt") public void testElseOnNullableEnumWithSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.kt"); doTest(fileName); } @TestMetadata("EmptyConditionWithExpression.kt") public void testEmptyConditionWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/EmptyConditionWithExpression.kt"); doTest(fileName); } @TestMetadata("EmptyConditionWithExpressionEnum.kt") public void testEmptyConditionWithExpressionEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/EmptyConditionWithExpressionEnum.kt"); doTest(fileName); } @TestMetadata("ExhaustiveBoolean.kt") public void testExhaustiveBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBoolean.kt"); doTest(fileName); } @TestMetadata("ExhaustiveBooleanBrackets.kt") public void testExhaustiveBooleanBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanBrackets.kt"); doTest(fileName); } @TestMetadata("ExhaustiveBooleanComplex.kt") public void testExhaustiveBooleanComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanComplex.kt"); doTest(fileName); } @TestMetadata("ExhaustiveBooleanNullable.kt") public void testExhaustiveBooleanNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveBooleanNullable.kt"); doTest(fileName); } @TestMetadata("ExhaustiveEnumIs.kt") public void testExhaustiveEnumIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt"); doTest(fileName); } @TestMetadata("ExhaustiveEnumMixed.kt") public void testExhaustiveEnumMixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt"); doTest(fileName); } @TestMetadata("ExhaustiveInitialization.kt") public void testExhaustiveInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.kt"); doTest(fileName); } @TestMetadata("ExhaustiveNullable.kt") public void testExhaustiveNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt"); doTest(fileName); } @TestMetadata("ExhaustivePlatformEnum.kt") public void testExhaustivePlatformEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.kt"); doTest(fileName); } @TestMetadata("ExhaustivePlatformEnumAnnotated.kt") public void testExhaustivePlatformEnumAnnotated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumAnnotated.kt"); doTest(fileName); } @TestMetadata("ExhaustivePlatformEnumElse.kt") public void testExhaustivePlatformEnumElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumElse.kt"); doTest(fileName); } @TestMetadata("ExhaustivePlatformEnumNull.kt") public void testExhaustivePlatformEnumNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumNull.kt"); doTest(fileName); } @TestMetadata("ExhaustivePlatformEnumStatement.kt") public void testExhaustivePlatformEnumStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.kt"); doTest(fileName); } @TestMetadata("ExhaustiveReturn.kt") public void testExhaustiveReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWithNullabilityCheck.kt") public void testExhaustiveWithNullabilityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWithNullabilityCheckBefore.kt") public void testExhaustiveWithNullabilityCheckBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWithNullabilityCheckBoolean.kt") public void testExhaustiveWithNullabilityCheckBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt"); doTest(fileName); } @TestMetadata("ExhaustiveWithNullabilityCheckElse.kt") public void testExhaustiveWithNullabilityCheckElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt"); doTest(fileName); } @TestMetadata("kt4434.kt") public void testKt4434() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/kt4434.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/kt4434.kt"); doTest(fileName); } @TestMetadata("NoElseExpectedUnit.kt") public void testNoElseExpectedUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt"); doTest(fileName); } @TestMetadata("NoElseNoExpectedType.kt") public void testNoElseNoExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt"); doTest(fileName); } @TestMetadata("NoElseReturnedCoercionToUnit.kt") public void testNoElseReturnedCoercionToUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt"); doTest(fileName); } @TestMetadata("NoElseReturnedFromLambdaExpectedInt.kt") public void testNoElseReturnedFromLambdaExpectedInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt"); doTest(fileName); } @TestMetadata("NoElseReturnedNonUnit.kt") public void testNoElseReturnedNonUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt"); doTest(fileName); } @TestMetadata("NoElseReturnedUnit.kt") public void testNoElseReturnedUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt"); doTest(fileName); } @TestMetadata("NoElseWhenStatement.kt") public void testNoElseWhenStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveBooleanNullable.kt") public void testNonExhaustiveBooleanNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.kt"); doTest(fileName); } @TestMetadata("NonExhaustivePlatformEnum.kt") public void testNonExhaustivePlatformEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWarning.kt") public void testNonExhaustiveWarning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWarningElse.kt") public void testNonExhaustiveWarningElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningElse.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWarningFalse.kt") public void testNonExhaustiveWarningFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWarningNull.kt") public void testNonExhaustiveWarningNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.kt"); doTest(fileName); } @TestMetadata("NonExhaustiveWithNullabilityCheck.kt") public void testNonExhaustiveWithNullabilityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt"); doTest(fileName); } @TestMetadata("PropertyNotInitialized.kt") public void testPropertyNotInitialized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt"); doTest(fileName); } @TestMetadata("When.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/When.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/When.kt"); doTest(fileName); } } @@ -17090,32 +17090,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/script") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Script extends AbstractJetDiagnosticsTest { + public static class Script extends AbstractDiagnosticsTest { @TestMetadata("AccessForwardDeclarationInScript.kts") public void testAccessForwardDeclarationInScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.kts"); doTest(fileName); } public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kts$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kts$"), true); } @TestMetadata("ComplexScript.kts") public void testComplexScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/ComplexScript.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/ComplexScript.kts"); doTest(fileName); } @TestMetadata("imports.kts") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/imports.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/imports.kts"); doTest(fileName); } @TestMetadata("SimpleScript.kts") public void testSimpleScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/SimpleScript.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/SimpleScript.kts"); doTest(fileName); } } @@ -17123,30 +17123,30 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Diagnostics extends AbstractJetDiagnosticsTest { + public static class Diagnostics extends AbstractDiagnosticsTest { public void testAllFilesPresentInDiagnostics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractJetDiagnosticsTest { + public static class Functions extends AbstractDiagnosticsTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/inference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractJetDiagnosticsTest { + public static class Inference extends AbstractDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt6176.kt") public void testKt6176() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.kt"); doTest(fileName); } } @@ -17154,76 +17154,76 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Invoke extends AbstractJetDiagnosticsTest { + public static class Invoke extends AbstractDiagnosticsTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnObjects extends AbstractJetDiagnosticsTest { + public static class OnObjects extends AbstractDiagnosticsTest { public void testAllFilesPresentInOnObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("invokeOnClassObject1.kt") public void testInvokeOnClassObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObject2.kt") public void testInvokeOnClassObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") public void testInvokeOnClassObjectOfNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") public void testInvokeOnClassObjectOfNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); doTest(fileName); } @TestMetadata("invokeOnEnum1.kt") public void testInvokeOnEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); doTest(fileName); } @TestMetadata("invokeOnEnum2.kt") public void testInvokeOnEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); doTest(fileName); } @TestMetadata("invokeOnImportedEnum1.kt") public void testInvokeOnImportedEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); doTest(fileName); } @TestMetadata("invokeOnImportedEnum2.kt") public void testInvokeOnImportedEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); doTest(fileName); } @TestMetadata("invokeOnObject1.kt") public void testInvokeOnObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnObject2.kt") public void testInvokeOnObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); doTest(fileName); } } @@ -17232,224 +17232,224 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TailRecursion extends AbstractJetDiagnosticsTest { + public static class TailRecursion extends AbstractDiagnosticsTest { public void testAllFilesPresentInTailRecursion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); doTest(fileName); } @TestMetadata("extensionTailCall.kt") public void testExtensionTailCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); doTest(fileName); } @TestMetadata("functionWithNoTails.kt") public void testFunctionWithNoTails() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); doTest(fileName); } @TestMetadata("functionWithNonTailRecursions.kt") public void testFunctionWithNonTailRecursions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); doTest(fileName); } @TestMetadata("functionWithoutAnnotation.kt") public void testFunctionWithoutAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); doTest(fileName); } @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); doTest(fileName); } @TestMetadata("insideElvis.kt") public void testInsideElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); doTest(fileName); } @TestMetadata("labeledThisReferences.kt") public void testLabeledThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); doTest(fileName); } @TestMetadata("loops.kt") public void testLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); doTest(fileName); } @TestMetadata("multilevelBlocks.kt") public void testMultilevelBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); doTest(fileName); } @TestMetadata("realIteratorFoldl.kt") public void testRealIteratorFoldl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); doTest(fileName); } @TestMetadata("realStringEscape.kt") public void testRealStringEscape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); doTest(fileName); } @TestMetadata("realStringRepeat.kt") public void testRealStringRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); doTest(fileName); } @TestMetadata("recursiveCallInLambda.kt") public void testRecursiveCallInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); doTest(fileName); } @TestMetadata("recursiveCallInLocalFunction.kt") public void testRecursiveCallInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); doTest(fileName); } @TestMetadata("recursiveInnerFunction.kt") public void testRecursiveInnerFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); doTest(fileName); } @TestMetadata("returnIf.kt") public void testReturnIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); doTest(fileName); } @TestMetadata("returnInCatch.kt") public void testReturnInCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); doTest(fileName); } @TestMetadata("returnInFinally.kt") public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); doTest(fileName); } @TestMetadata("returnInIfInFinally.kt") public void testReturnInIfInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); doTest(fileName); } @TestMetadata("returnInParentheses.kt") public void testReturnInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); doTest(fileName); } @TestMetadata("returnInTry.kt") public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); doTest(fileName); } @TestMetadata("simpleBlock.kt") public void testSimpleBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); doTest(fileName); } @TestMetadata("simpleReturn.kt") public void testSimpleReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); doTest(fileName); } @TestMetadata("simpleReturnWithElse.kt") public void testSimpleReturnWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); doTest(fileName); } @TestMetadata("sum.kt") public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); doTest(fileName); } @TestMetadata("tailCallInBlockInParentheses.kt") public void testTailCallInBlockInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); doTest(fileName); } @TestMetadata("tailCallInParentheses.kt") public void testTailCallInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); doTest(fileName); } @TestMetadata("tailRecursionInFinally.kt") public void testTailRecursionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); doTest(fileName); } @TestMetadata("thisReferences.kt") public void testThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); doTest(fileName); } @TestMetadata("unitBlocks.kt") public void testUnitBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); doTest(fileName); } @TestMetadata("whenWithCondition.kt") public void testWhenWithCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); doTest(fileName); } @TestMetadata("whenWithInRange.kt") public void testWhenWithInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); doTest(fileName); } @TestMetadata("whenWithIs.kt") public void testWhenWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); doTest(fileName); } @TestMetadata("whenWithoutCondition.kt") public void testWhenWithoutCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); doTest(fileName); } } @@ -17458,14 +17458,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/vararg") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Vararg extends AbstractJetDiagnosticsTest { + public static class Vararg extends AbstractDiagnosticsTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt4172.kt") public void testKt4172() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java index 94f1fdff1c8..6177e48a42a 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,40 +30,40 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated extends AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation { +public class DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated extends AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation { public void testAllFilesPresentInTestsWithJsStdLibAndBackendCompilation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inline extends AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation { + public static class Inline extends AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("recursionCycle.kt") public void testRecursionCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycle.kt"); doTest(fileName); } @TestMetadata("recursionCycleLambda.kt") public void testRecursionCycleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleLambda.kt"); doTest(fileName); } @TestMetadata("recursionCycleWithPublicFun.kt") public void testRecursionCycleWithPublicFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleWithPublicFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleWithPublicFun.kt"); doTest(fileName); } @TestMetadata("recursionCycleWithStdlibCall.kt") public void testRecursionCycleWithStdlibCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleWithStdlibCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation/inline/recursionCycleWithStdlibCall.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java index 974c36527e4..86aca478415 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,208 +30,208 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnosticsTestWithJsStdLib { +public class DiagnosticsTestWithJsStdLibGenerated extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInTestsWithJsStdLib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Serializable.kt") public void testSerializable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/Serializable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/Serializable.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DynamicTypes extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class DynamicTypes extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInDynamicTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/assignment.kt"); doTest(fileName); } @TestMetadata("block.kt") public void testBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/block.kt"); doTest(fileName); } @TestMetadata("callableReferences.kt") public void testCallableReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/callableReferences.kt"); doTest(fileName); } @TestMetadata("comparisonToNull.kt") public void testComparisonToNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/comparisonToNull.kt"); doTest(fileName); } @TestMetadata("conditions.kt") public void testConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conditions.kt"); doTest(fileName); } @TestMetadata("conventions.kt") public void testConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/conventions.kt"); doTest(fileName); } @TestMetadata("delegationBy.kt") public void testDelegationBy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/delegationBy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/delegationBy.kt"); doTest(fileName); } @TestMetadata("dynamicCalls.kt") public void testDynamicCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCalls.kt"); doTest(fileName); } @TestMetadata("dynamicCallsWithLambdas.kt") public void testDynamicCallsWithLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCallsWithLambdas.kt"); doTest(fileName); } @TestMetadata("dynamicCastTarget.kt") public void testDynamicCastTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.kt"); doTest(fileName); } @TestMetadata("dynamicSafeCalls.kt") public void testDynamicSafeCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicSafeCalls.kt"); doTest(fileName); } @TestMetadata("extensionVals.kt") public void testExtensionVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVals.kt"); doTest(fileName); } @TestMetadata("extensionVars.kt") public void testExtensionVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionVars.kt"); doTest(fileName); } @TestMetadata("extensions.kt") public void testExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensions.kt"); doTest(fileName); } @TestMetadata("extensionsToDynamic.kt") public void testExtensionsToDynamic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/extensionsToDynamic.kt"); doTest(fileName); } @TestMetadata("implicitDynamicReceiver.kt") public void testImplicitDynamicReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/implicitDynamicReceiver.kt"); doTest(fileName); } @TestMetadata("inference.kt") public void testInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/inference.kt"); doTest(fileName); } @TestMetadata("membersOfAny.kt") public void testMembersOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/membersOfAny.kt"); doTest(fileName); } @TestMetadata("namedArguments.kt") public void testNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/namedArguments.kt"); doTest(fileName); } @TestMetadata("noUnsupportedInLocals.kt") public void testNoUnsupportedInLocals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/noUnsupportedInLocals.kt"); doTest(fileName); } @TestMetadata("nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/nullable.kt"); doTest(fileName); } @TestMetadata("overloading.kt") public void testOverloading() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloading.kt"); doTest(fileName); } @TestMetadata("overloadingAmbiguity.kt") public void testOverloadingAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overloadingAmbiguity.kt"); doTest(fileName); } @TestMetadata("overrides.kt") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/overrides.kt"); doTest(fileName); } @TestMetadata("reified.kt") public void testReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/reified.kt"); doTest(fileName); } @TestMetadata("smartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/smartCast.kt"); doTest(fileName); } @TestMetadata("spreadOperator.kt") public void testSpreadOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/spreadOperator.kt"); doTest(fileName); } @TestMetadata("staticCallsInDynamicContext.kt") public void testStaticCallsInDynamicContext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/staticCallsInDynamicContext.kt"); doTest(fileName); } @TestMetadata("substitution.kt") public void testSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/substitution.kt"); doTest(fileName); } @TestMetadata("supertypesAndBounds.kt") public void testSupertypesAndBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/supertypesAndBounds.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/varargs.kt"); doTest(fileName); } } @@ -239,32 +239,32 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JsCode extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class JsCode extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInJsCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/jsCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/jsCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentIsLiteral.kt") public void testArgumentIsLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/argumentIsLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/argumentIsLiteral.kt"); doTest(fileName); } @TestMetadata("error.kt") public void testError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/error.kt"); doTest(fileName); } @TestMetadata("noJavaScriptProduced.kt") public void testNoJavaScriptProduced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/noJavaScriptProduced.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/noJavaScriptProduced.kt"); doTest(fileName); } @TestMetadata("warning.kt") public void testWarning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/jsCode/warning.kt"); doTest(fileName); } } @@ -272,76 +272,76 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Native extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class Native extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInNative() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NativeGetter extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class NativeGetter extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInNativeGetter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("onLocalExtensionFun.kt") public void testOnLocalExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalExtensionFun.kt"); doTest(fileName); } @TestMetadata("onLocalNativeClassMembers.kt") public void testOnLocalNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalNonNativeClassMembers.kt") public void testOnLocalNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalOtherDeclarations.kt") public void testOnLocalOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onLocalOtherDeclarations.kt"); doTest(fileName); } @TestMetadata("onNativeClassMembers.kt") public void testOnNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNativeClass.kt") public void testOnNestedDeclarationsInsideNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNativeClass.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt") public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNestedDeclarationsInsideNonNativeClass.kt"); doTest(fileName); } @TestMetadata("onNonNativeClassMembers.kt") public void testOnNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onToplevelExtensionFun.kt") public void testOnToplevelExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelExtensionFun.kt"); doTest(fileName); } @TestMetadata("onToplevelOtherDeclarations.kt") public void testOnToplevelOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeGetter/onToplevelOtherDeclarations.kt"); doTest(fileName); } } @@ -349,68 +349,68 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NativeInvoke extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class NativeInvoke extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInNativeInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("onLocalExtensionFun.kt") public void testOnLocalExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalExtensionFun.kt"); doTest(fileName); } @TestMetadata("onLocalNativeClassMembers.kt") public void testOnLocalNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalNonNativeClassMembers.kt") public void testOnLocalNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalOtherDeclarations.kt") public void testOnLocalOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onLocalOtherDeclarations.kt"); doTest(fileName); } @TestMetadata("onNativeClassMembers.kt") public void testOnNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNativeClass.kt") public void testOnNestedDeclarationsInsideNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNativeClass.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt") public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNestedDeclarationsInsideNonNativeClass.kt"); doTest(fileName); } @TestMetadata("onNonNativeClassMembers.kt") public void testOnNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onToplevelExtensionFun.kt") public void testOnToplevelExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelExtensionFun.kt"); doTest(fileName); } @TestMetadata("onToplevelOtherDeclarations.kt") public void testOnToplevelOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeInvoke/onToplevelOtherDeclarations.kt"); doTest(fileName); } } @@ -418,68 +418,68 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NativeSetter extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class NativeSetter extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInNativeSetter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("onLocalExtensionFun.kt") public void testOnLocalExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalExtensionFun.kt"); doTest(fileName); } @TestMetadata("onLocalNativeClassMembers.kt") public void testOnLocalNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalNonNativeClassMembers.kt") public void testOnLocalNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onLocalOtherDeclarations.kt") public void testOnLocalOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onLocalOtherDeclarations.kt"); doTest(fileName); } @TestMetadata("onNativeClassMembers.kt") public void testOnNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNativeClass.kt") public void testOnNestedDeclarationsInsideNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNativeClass.kt"); doTest(fileName); } @TestMetadata("onNestedDeclarationsInsideNonNativeClass.kt") public void testOnNestedDeclarationsInsideNonNativeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNestedDeclarationsInsideNonNativeClass.kt"); doTest(fileName); } @TestMetadata("onNonNativeClassMembers.kt") public void testOnNonNativeClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onNonNativeClassMembers.kt"); doTest(fileName); } @TestMetadata("onToplevelExtensionFun.kt") public void testOnToplevelExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelExtensionFun.kt"); doTest(fileName); } @TestMetadata("onToplevelOtherDeclarations.kt") public void testOnToplevelOtherDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/nativeSetter/onToplevelOtherDeclarations.kt"); doTest(fileName); } } @@ -487,32 +487,32 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OptionlBody extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class OptionlBody extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInOptionlBody() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("native.kt") public void testNative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/native.kt"); doTest(fileName); } @TestMetadata("nativeGetter.kt") public void testNativeGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeGetter.kt"); doTest(fileName); } @TestMetadata("nativeInvoke.kt") public void testNativeInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeInvoke.kt"); doTest(fileName); } @TestMetadata("nativeSetter.kt") public void testNativeSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/optionlBody/nativeSetter.kt"); doTest(fileName); } } @@ -520,32 +520,32 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnusedParam extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class UnusedParam extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInUnusedParam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("native.kt") public void testNative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/native.kt"); doTest(fileName); } @TestMetadata("nativeGetter.kt") public void testNativeGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeGetter.kt"); doTest(fileName); } @TestMetadata("nativeInvoke.kt") public void testNativeInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeInvoke.kt"); doTest(fileName); } @TestMetadata("nativeSetter.kt") public void testNativeSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native/unusedParam/nativeSetter.kt"); doTest(fileName); } } @@ -554,20 +554,20 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnsupportedFeatures extends AbstractJetDiagnosticsTestWithJsStdLib { + public static class UnsupportedFeatures extends AbstractDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInUnsupportedFeatures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localClassifier.kt") public void testLocalClassifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/localClassifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/localClassifier.kt"); doTest(fileName); } @TestMetadata("nestedInnerClassifier.kt") public void testNestedInnerClassifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithJsStdLib/unsupportedFeatures/nestedInnerClassifier.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java index c19bc50f6eb..506980cb299 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,138 +30,138 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/diagnostics/testsWithStdLib") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib { +public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInTestsWithStdLib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CallToMainRedeclaredInMultiFile.kt") public void testCallToMainRedeclaredInMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/CallToMainRedeclaredInMultiFile.kt"); doTest(fileName); } @TestMetadata("commonCollections.kt") public void testCommonCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt"); doTest(fileName); } @TestMetadata("elvisOnUnitInLet.kt") public void testElvisOnUnitInLet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/elvisOnUnitInLet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/elvisOnUnitInLet.kt"); doTest(fileName); } @TestMetadata("instar.kt") public void testInstar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/instar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/instar.kt"); doTest(fileName); } @TestMetadata("javaClassOnCompanion.kt") public void testJavaClassOnCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/javaClassOnCompanion.kt"); doTest(fileName); } @TestMetadata("kt9078.kt") public void testKt9078() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kt9078.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kt9078.kt"); doTest(fileName); } @TestMetadata("outstar.kt") public void testOutstar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/outstar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/outstar.kt"); doTest(fileName); } @TestMetadata("overrideWithFunctionalType.kt") public void testOverrideWithFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/overrideWithFunctionalType.kt"); doTest(fileName); } @TestMetadata("RedeclarationMainInMultiFileClass.kt") public void testRedeclarationMainInMultiFileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/RedeclarationMainInMultiFileClass.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib { + public static class Annotations extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectAnnotatedWithItsKClass.kt") public void testClassObjectAnnotatedWithItsKClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsKClass.kt"); doTest(fileName); } @TestMetadata("defaultValueMustBeConstant.kt") public void testDefaultValueMustBeConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/defaultValueMustBeConstant.kt"); doTest(fileName); } @TestMetadata("qualifiedCallValue.kt") public void testQualifiedCallValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.kt"); doTest(fileName); } @TestMetadata("Synchronized.kt") public void testSynchronized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/Synchronized.kt"); doTest(fileName); } @TestMetadata("targetuse.kt") public void testTargetuse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/targetuse.kt"); doTest(fileName); } @TestMetadata("Volatile.kt") public void testVolatile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/Volatile.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationApplicability extends AbstractJetDiagnosticsTestWithStdLib { + public static class AnnotationApplicability extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationApplicability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("illegalPlatformName.kt") public void testIllegalPlatformName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt"); doTest(fileName); } @TestMetadata("jvmName.kt") public void testJvmName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt"); doTest(fileName); } @TestMetadata("multifileClassPart.kt") public void testMultifileClassPart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPart.kt"); doTest(fileName); } @TestMetadata("multifileClassPartWithJavaAnnotation.kt") public void testMultifileClassPartWithJavaAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPartWithJavaAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/multifileClassPartWithJavaAnnotation.kt"); doTest(fileName); } } @@ -169,32 +169,32 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTestWithStdLib { + public static class AnnotationParameterMustBeConstant extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt"); doTest(fileName); } @TestMetadata("useOfNonConstVal.kt") public void testUseOfNonConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/useOfNonConstVal.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt"); doTest(fileName); } } @@ -202,44 +202,44 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationParameters extends AbstractJetDiagnosticsTestWithStdLib { + public static class AnnotationParameters extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("orderWithValue.kt") public void testOrderWithValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.kt"); doTest(fileName); } @TestMetadata("orderWithoutValue.kt") public void testOrderWithoutValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.kt"); doTest(fileName); } @TestMetadata("valueArray.kt") public void testValueArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.kt"); doTest(fileName); } @TestMetadata("valueArrayAndOtherDefault.kt") public void testValueArrayAndOtherDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt"); doTest(fileName); } @TestMetadata("valueArrayOnly.kt") public void testValueArrayOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.kt"); doTest(fileName); } @TestMetadata("valueArrayWithDefault.kt") public void testValueArrayWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.kt"); doTest(fileName); } } @@ -247,20 +247,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationWithVarargParameter extends AbstractJetDiagnosticsTestWithStdLib { + public static class AnnotationWithVarargParameter extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationWithVarargParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaAnnotationWithVarargArgument.kt") public void testJavaAnnotationWithVarargArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt"); doTest(fileName); } @TestMetadata("kotlinAnnotationWithVarargArgument.kt") public void testKotlinAnnotationWithVarargArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt"); doTest(fileName); } } @@ -268,80 +268,80 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaAnnotationsWithKClassParameter extends AbstractJetDiagnosticsTestWithStdLib { + public static class JavaAnnotationsWithKClassParameter extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInJavaAnnotationsWithKClassParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationAsArgument.kt") public void testAnnotationAsArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.kt"); doTest(fileName); } @TestMetadata("arg.kt") public void testArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.kt"); doTest(fileName); } @TestMetadata("argAndOtherDefault.kt") public void testArgAndOtherDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.kt"); doTest(fileName); } @TestMetadata("argArray.kt") public void testArgArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.kt"); doTest(fileName); } @TestMetadata("argWithDefault.kt") public void testArgWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.kt"); doTest(fileName); } @TestMetadata("argWithDefaultAndOther.kt") public void testArgWithDefaultAndOther() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.kt"); doTest(fileName); } @TestMetadata("twoArgs.kt") public void testTwoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.kt"); doTest(fileName); } @TestMetadata("value.kt") public void testValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.kt"); doTest(fileName); } @TestMetadata("valueAndOtherDefault.kt") public void testValueAndOtherDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.kt"); doTest(fileName); } @TestMetadata("valueArray.kt") public void testValueArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.kt"); doTest(fileName); } @TestMetadata("valueWithDefault.kt") public void testValueWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.kt"); doTest(fileName); } @TestMetadata("valueWithDefaultAndOther.kt") public void testValueWithDefaultAndOther() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.kt"); doTest(fileName); } } @@ -349,32 +349,32 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmField extends AbstractJetDiagnosticsTestWithStdLib { + public static class JvmField extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInJvmField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("clashWithCompanionObjectField.kt") public void testClashWithCompanionObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/clashWithCompanionObjectField.kt"); doTest(fileName); } @TestMetadata("inMultiFileFacade.kt") public void testInMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inMultiFileFacade.kt"); doTest(fileName); } @TestMetadata("inSingleFileFacade.kt") public void testInSingleFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inSingleFileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/inSingleFileFacade.kt"); doTest(fileName); } @TestMetadata("jvmFieldApplicability.kt") public void testJvmFieldApplicability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmField/jvmFieldApplicability.kt"); doTest(fileName); } } @@ -382,26 +382,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JvmOverloads extends AbstractJetDiagnosticsTestWithStdLib { + public static class JvmOverloads extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInJvmOverloads() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("JvmOverloadWithNoDefaults.kt") public void testJvmOverloadWithNoDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt"); doTest(fileName); } @TestMetadata("jvmOverloadsOnAbstractMethods.kt") public void testJvmOverloadsOnAbstractMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt"); doTest(fileName); } @TestMetadata("jvmOverloadsOnPrivate.kt") public void testJvmOverloadsOnPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt"); doTest(fileName); } } @@ -409,50 +409,50 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KClass extends AbstractJetDiagnosticsTestWithStdLib { + public static class KClass extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInKClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kClassArrayInAnnotationsInVariance.kt") public void testKClassArrayInAnnotationsInVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt"); doTest(fileName); } @TestMetadata("kClassArrayInAnnotationsOutVariance.kt") public void testKClassArrayInAnnotationsOutVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt"); doTest(fileName); } @TestMetadata("kClassInAnnotation.kt") public void testKClassInAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotation.kt"); doTest(fileName); } @TestMetadata("kClassInAnnotationsInVariance.kt") public void testKClassInAnnotationsInVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.kt"); doTest(fileName); } @TestMetadata("kClassInAnnotationsOutVariance.kt") public void testKClassInAnnotationsOutVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.kt"); doTest(fileName); } @TestMetadata("kClassInvariantTP.kt") public void testKClassInvariantTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.kt"); doTest(fileName); } @TestMetadata("kClassOutArrayInAnnotationsOutVariance.kt") public void testKClassOutArrayInAnnotationsOutVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassOutArrayInAnnotationsOutVariance.kt"); doTest(fileName); } } @@ -460,38 +460,38 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformStatic extends AbstractJetDiagnosticsTestWithStdLib { + public static class PlatformStatic extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInPlatformStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt"); doTest(fileName); } @TestMetadata("finalAndAbstract.kt") public void testFinalAndAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt"); doTest(fileName); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt"); doTest(fileName); } } @@ -499,38 +499,38 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ProhibitPositionedArgument extends AbstractJetDiagnosticsTestWithStdLib { + public static class ProhibitPositionedArgument extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInProhibitPositionedArgument() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kotlinAnnotation.kt") public void testKotlinAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/kotlinAnnotation.kt"); doTest(fileName); } @TestMetadata("tooManyArgs.kt") public void testTooManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.kt"); doTest(fileName); } @TestMetadata("typeMismatch.kt") public void testTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.kt"); doTest(fileName); } @TestMetadata("withValue.kt") public void testWithValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.kt"); doTest(fileName); } @TestMetadata("withoutValue.kt") public void testWithoutValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.kt"); doTest(fileName); } } @@ -539,20 +539,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/cast") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Cast extends AbstractJetDiagnosticsTestWithStdLib { + public static class Cast extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/cast"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/cast"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("IsArray.kt") public void testIsArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/cast/IsArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/cast/IsArray.kt"); doTest(fileName); } @TestMetadata("IsReified.kt") public void testIsReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/cast/IsReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/cast/IsReified.kt"); doTest(fileName); } } @@ -560,76 +560,76 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTestWithStdLib { + public static class DuplicateJvmSignature extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt"); doTest(fileName); } @TestMetadata("jvmOverloads.kt") public void testJvmOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt"); doTest(fileName); } @TestMetadata("platformNames.kt") public void testPlatformNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt"); doTest(fileName); } @TestMetadata("platformNamesDuplicate.kt") public void testPlatformNamesDuplicate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt"); doTest(fileName); } @TestMetadata("platformStaticInClassObject.kt") public void testPlatformStaticInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt"); doTest(fileName); } @TestMetadata("platformStaticInObject.kt") public void testPlatformStaticInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Statics extends AbstractJetDiagnosticsTestWithStdLib { + public static class Statics extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jjk.kt") public void testJjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jjk.kt"); doTest(fileName); } @TestMetadata("jk.kt") public void testJk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jk.kt"); doTest(fileName); } @TestMetadata("jkjk.kt") public void testJkjk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/jkjk.kt"); doTest(fileName); } @TestMetadata("kotlinMembersVsJavaNonVisibleStatics.kt") public void testKotlinMembersVsJavaNonVisibleStatics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/statics/kotlinMembersVsJavaNonVisibleStatics.kt"); doTest(fileName); } } @@ -638,14 +638,14 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionLiterals extends AbstractJetDiagnosticsTestWithStdLib { + public static class FunctionLiterals extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("pseudocodeMemoryOverhead.kt") public void testPseudocodeMemoryOverhead() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt"); doTest(fileName); } } @@ -653,70 +653,70 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/inference") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inference extends AbstractJetDiagnosticsTestWithStdLib { + public static class Inference extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayConstructor.kt") public void testArrayConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/arrayConstructor.kt"); doTest(fileName); } @TestMetadata("kt1558.kt") public void testKt1558() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.kt"); doTest(fileName); } @TestMetadata("kt3458.kt") public void testKt3458() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt3458.kt"); doTest(fileName); } @TestMetadata("kt4975.kt") public void testKt4975() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.kt"); doTest(fileName); } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AnnotationsForResolve extends AbstractJetDiagnosticsTestWithStdLib { + public static class AnnotationsForResolve extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationsForResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("exactAnnotation.kt") public void testExactAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt"); doTest(fileName); } @TestMetadata("internalAnnotationsOnTypes.kt") public void testInternalAnnotationsOnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.kt"); doTest(fileName); } @TestMetadata("noInferAnnotation.kt") public void testNoInferAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt"); doTest(fileName); } @TestMetadata("onlyInputTypesAnnotationWithPlatformTypes.kt") public void testOnlyInputTypesAnnotationWithPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAnnotationWithPlatformTypes.kt"); doTest(fileName); } @TestMetadata("resolveWithOnlyInputTypesAnnotation.kt") public void testResolveWithOnlyInputTypesAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt"); doTest(fileName); } } @@ -725,20 +725,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinSignature extends AbstractJetDiagnosticsTestWithStdLib { + public static class KotlinSignature extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorNamedArguments.kt") public void testConstructorNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt"); doTest(fileName); } @TestMetadata("parameterNames.kt") public void testParameterNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt"); doTest(fileName); } } @@ -746,14 +746,14 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kt7585") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Kt7585 extends AbstractJetDiagnosticsTestWithStdLib { + public static class Kt7585 extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInKt7585() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kt7585"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kt7585"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegate.kt") public void testDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt"); doTest(fileName); } } @@ -761,56 +761,56 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/native") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Native extends AbstractJetDiagnosticsTestWithStdLib { + public static class Native extends AbstractDiagnosticsTestWithStdLib { @TestMetadata("abstract.kt") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/abstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/abstract.kt"); doTest(fileName); } public void testAllFilesPresentInNative() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/native"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/native"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("body.kt") public void testBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/body.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/body.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/constructor.kt"); doTest(fileName); } @TestMetadata("inline.kt") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/inline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/inline.kt"); doTest(fileName); } @TestMetadata("noBody.kt") public void testNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/noBody.kt"); doTest(fileName); } @TestMetadata("override.kt") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/override.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/override.kt"); doTest(fileName); } @TestMetadata("reified.kt") public void testReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/reified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/reified.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/native/trait.kt"); doTest(fileName); } } @@ -818,68 +818,68 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PurelyImplementedCollection extends AbstractJetDiagnosticsTestWithStdLib { + public static class PurelyImplementedCollection extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInPurelyImplementedCollection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt"); doTest(fileName); } @TestMetadata("arrayListNullable.kt") public void testArrayListNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt"); doTest(fileName); } @TestMetadata("customClassMutableCollection.kt") public void testCustomClassMutableCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt"); doTest(fileName); } @TestMetadata("customClassMutableList.kt") public void testCustomClassMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt"); doTest(fileName); } @TestMetadata("invalidFqName.kt") public void testInvalidFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.kt"); doTest(fileName); } @TestMetadata("maps.kt") public void testMaps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt"); doTest(fileName); } @TestMetadata("mapsWithNullableKey.kt") public void testMapsWithNullableKey() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt"); doTest(fileName); } @TestMetadata("mapsWithNullableValues.kt") public void testMapsWithNullableValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt"); doTest(fileName); } @TestMetadata("sets.kt") public void testSets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt"); doTest(fileName); } @TestMetadata("wrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt"); doTest(fileName); } } @@ -887,38 +887,38 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/regression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Regression extends AbstractJetDiagnosticsTestWithStdLib { + public static class Regression extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInRegression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/regression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/regression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ea63992.kt") public void testEa63992() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.kt"); doTest(fileName); } @TestMetadata("ea65206.kt") public void testEa65206() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea65206.kt"); doTest(fileName); } @TestMetadata("ea66827_dataClassWrongToString.kt") public void testEa66827_dataClassWrongToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.kt"); doTest(fileName); } @TestMetadata("ea70880_illegalJvmName.kt") public void testEa70880_illegalJvmName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.kt"); doTest(fileName); } @TestMetadata("kt2082.kt") public void testKt2082() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.kt"); doTest(fileName); } } @@ -926,32 +926,32 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/reified") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Reified extends AbstractJetDiagnosticsTestWithStdLib { + public static class Reified extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInReified() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/reified"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/reified"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayConstruction.kt") public void testArrayConstruction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt"); doTest(fileName); } @TestMetadata("arrayOfNullsReified.kt") public void testArrayOfNullsReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.kt"); doTest(fileName); } @TestMetadata("nonCallableReiefied.kt") public void testNonCallableReiefied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.kt"); doTest(fileName); } @TestMetadata("reifiedNothingSubstitution.kt") public void testReifiedNothingSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt"); doTest(fileName); } } @@ -959,14 +959,14 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Resolve extends AbstractJetDiagnosticsTestWithStdLib { + public static class Resolve extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/resolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt4711.kt") public void testKt4711() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt"); doTest(fileName); } } @@ -974,74 +974,74 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Smartcasts extends AbstractJetDiagnosticsTestWithStdLib { + public static class Smartcasts extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInSmartcasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/smartcasts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/smartcasts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("forEachSafe.kt") public void testForEachSafe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt"); doTest(fileName); } @TestMetadata("forEachUnsafe.kt") public void testForEachUnsafe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt"); doTest(fileName); } @TestMetadata("lazyDeclaresAndModifies.kt") public void testLazyDeclaresAndModifies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/lazyDeclaresAndModifies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/lazyDeclaresAndModifies.kt"); doTest(fileName); } @TestMetadata("letAlwaysChangesToNotNull.kt") public void testLetAlwaysChangesToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letAlwaysChangesToNotNull.kt"); doTest(fileName); } @TestMetadata("letChangesToNotNull.kt") public void testLetChangesToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNotNull.kt"); doTest(fileName); } @TestMetadata("letChangesToNull.kt") public void testLetChangesToNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNull.kt"); doTest(fileName); } @TestMetadata("letChangesToNullComplex.kt") public void testLetChangesToNullComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNullComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letChangesToNullComplex.kt"); doTest(fileName); } @TestMetadata("letMergeNotNull.kt") public void testLetMergeNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letMergeNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letMergeNotNull.kt"); doTest(fileName); } @TestMetadata("letStable.kt") public void testLetStable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letStable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letStable.kt"); doTest(fileName); } @TestMetadata("letUsesOwnReceiver.kt") public void testLetUsesOwnReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letUsesOwnReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/letUsesOwnReceiver.kt"); doTest(fileName); } @TestMetadata("withChangesToNull.kt") public void testWithChangesToNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/smartcasts/withChangesToNull.kt"); doTest(fileName); } } @@ -1049,26 +1049,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Varargs extends AbstractJetDiagnosticsTestWithStdLib { + public static class Varargs extends AbstractDiagnosticsTestWithStdLib { public void testAllFilesPresentInVarargs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/varargs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/varargs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt3213.kt") public void testKt3213() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt3213.kt"); doTest(fileName); } @TestMetadata("kt4172j.kt") public void testKt4172j() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt4172j.kt"); doTest(fileName); } @TestMetadata("kt5534.kt") public void testKt5534() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt5534.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/varargs/kt5534.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java index a04962195c5..fc1398a1652 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinLiteFixture; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; @@ -39,7 +39,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixture { +public abstract class KotlinMultiFileTestWithWithJava extends KotlinLiteFixture { protected class ModuleAndDependencies { final M module; final List dependencies; @@ -53,7 +53,7 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu protected static boolean writeSourceFile(@NotNull String fileName, @NotNull String content, @NotNull File targetDir) { try { File sourceFile = new File(targetDir, fileName); - JetTestUtils.mkdirs(sourceFile.getParentFile()); + KotlinTestUtils.mkdirs(sourceFile.getParentFile()); Files.write(content, sourceFile, Charset.forName("utf-8")); return true; } @@ -75,10 +75,10 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu @NotNull protected CompilerConfiguration createCompilerConfiguration(File javaFilesDir) { - return JetTestUtils.compilerConfigurationForTests( + return KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - Collections.singletonList(JetTestUtils.getAnnotationsJar()), + Collections.singletonList(KotlinTestUtils.getAnnotationsJar()), Collections.singletonList(javaFilesDir) ); } @@ -100,7 +100,7 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu protected static File createTmpDir(String dirName) { File dir = new File(FileUtil.getTempDirectory(), dirName); try { - JetTestUtils.mkdirs(dir); + KotlinTestUtils.mkdirs(dir); } catch (IOException e) { throw ExceptionUtilsKt.rethrow(e); @@ -113,12 +113,12 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu final File javaFilesDir = createJavaFilesDir(); final File kotlinFilesDir = getKotlinSourceRoot(); - String expectedText = JetTestUtils.doLoadFile(file); + String expectedText = KotlinTestUtils.doLoadFile(file); final Map modules = new HashMap(); List testFiles = - JetTestUtils.createTestFiles(file.getName(), expectedText, new JetTestUtils.TestFileFactory() { + KotlinTestUtils.createTestFiles(file.getName(), expectedText, new KotlinTestUtils.TestFileFactory() { @Override public F createFile( @Nullable M module, diff --git a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java index e29bd2b562c..20034df4b27 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java @@ -21,7 +21,7 @@ import com.intellij.execution.util.ExecUtil; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.common.ExitCode; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.PathUtil; @@ -46,7 +46,7 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir { File outFile = new File(argsFilePath.replace(".args", ".out")); try { - JetTestUtils.assertEqualsToFile(outFile, normalizedOutput); + KotlinTestUtils.assertEqualsToFile(outFile, normalizedOutput); } catch (Exception e) { System.err.println("exit code " + exitCode); diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 5bd6df39ef6..3f13da98931 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -29,7 +29,7 @@ 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.KotlinTestUtils; import org.jetbrains.kotlin.test.Tmpdir; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.junit.Rule; @@ -95,7 +95,7 @@ public class CliBaseTest { tmpdir.getTmpDir().getPath())); String actual = getNormalizedCompilerOutput(outputAndExitCode.first, outputAndExitCode.second, testDataDir); - JetTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual); + KotlinTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index a6062d5697d..7fd67054e8c 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,228 +34,228 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes @RunWith(JUnit3RunnerWithInners.class) public static class Jvm extends AbstractKotlincExecutableTest { public void testAllFilesPresentInJvm() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), false); } @TestMetadata("classAndFileClassClash.args") public void testClassAndFileClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndFileClassClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndFileClassClash.args"); doJvmTest(fileName); } @TestMetadata("classAndOtherFileClassClash.args") public void testClassAndOtherFileClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndOtherFileClassClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndOtherFileClassClash.args"); doJvmTest(fileName); } @TestMetadata("classAndPartClash.args") public void testClassAndPartClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndPartClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndPartClash.args"); doJvmTest(fileName); } @TestMetadata("classAndTraitClash.args") public void testClassAndTraitClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndTraitClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndTraitClash.args"); doJvmTest(fileName); } @TestMetadata("classpath.args") public void testClasspath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args"); doJvmTest(fileName); } @TestMetadata("conflictingOverloads.args") public void testConflictingOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args"); doJvmTest(fileName); } @TestMetadata("diagnosticsOrder.args") public void testDiagnosticsOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args"); doJvmTest(fileName); } @TestMetadata("duplicateSources.args") public void testDuplicateSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args"); doJvmTest(fileName); } @TestMetadata("duplicateSourcesInModule.args") public void testDuplicateSourcesInModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args"); doJvmTest(fileName); } @TestMetadata("emptySources.args") public void testEmptySources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/emptySources.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/emptySources.args"); doJvmTest(fileName); } @TestMetadata("extraHelp.args") public void testExtraHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args"); doJvmTest(fileName); } @TestMetadata("fileClassAndMultifileClassClash.args") public void testFileClassAndMultifileClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndMultifileClassClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndMultifileClassClash.args"); doJvmTest(fileName); } @TestMetadata("fileClassAndTImplClash.args") public void testFileClassAndTImplClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndTImplClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndTImplClash.args"); doJvmTest(fileName); } @TestMetadata("fileClassClashMultipleFiles.args") public void testFileClassClashMultipleFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassClashMultipleFiles.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassClashMultipleFiles.args"); doJvmTest(fileName); } @TestMetadata("help.args") public void testHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args"); doJvmTest(fileName); } @TestMetadata("inlineCycle.args") public void testInlineCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/inlineCycle.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/inlineCycle.args"); doJvmTest(fileName); } @TestMetadata("multipleTextRangesInDiagnosticsOrder.args") public void testMultipleTextRangesInDiagnosticsOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args"); doJvmTest(fileName); } @TestMetadata("nonExistingClassPathAndAnnotationsPath.args") public void testNonExistingClassPathAndAnnotationsPath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args"); doJvmTest(fileName); } @TestMetadata("nonExistingSourcePath.args") public void testNonExistingSourcePath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args"); doJvmTest(fileName); } @TestMetadata("nonLocalDisabled.args") public void testNonLocalDisabled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonLocalDisabled.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonLocalDisabled.args"); doJvmTest(fileName); } @TestMetadata("nonexistentPathInModule.args") public void testNonexistentPathInModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentPathInModule.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentPathInModule.args"); doJvmTest(fileName); } @TestMetadata("nonexistentScript.args") public void testNonexistentScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentScript.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentScript.args"); doJvmTest(fileName); } @TestMetadata("pluginSimple.args") public void testPluginSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimple.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimple.args"); doJvmTest(fileName); } @TestMetadata("pluginSimpleUsage.args") public void testPluginSimpleUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimpleUsage.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimpleUsage.args"); doJvmTest(fileName); } @TestMetadata("sanitized-name.clash.args") public void testSanitized_name_clash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/sanitized-name.clash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/sanitized-name.clash.args"); doJvmTest(fileName); } @TestMetadata("signatureClash.args") public void testSignatureClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args"); doJvmTest(fileName); } @TestMetadata("simple.args") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args"); doJvmTest(fileName); } @TestMetadata("suppressAllWarningsJvm.args") public void testSuppressAllWarningsJvm() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args"); doJvmTest(fileName); } @TestMetadata("syntheticAccessorForPropertiesSignatureClash.args") public void testSyntheticAccessorForPropertiesSignatureClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.args"); doJvmTest(fileName); } @TestMetadata("syntheticAccessorPropertyAndFunSignatureClash.args") public void testSyntheticAccessorPropertyAndFunSignatureClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.args"); doJvmTest(fileName); } @TestMetadata("syntheticAccessorSignatureClash.args") public void testSyntheticAccessorSignatureClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorSignatureClash.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorSignatureClash.args"); doJvmTest(fileName); } @TestMetadata("warningsInDummy.args") public void testWarningsInDummy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/warningsInDummy.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/warningsInDummy.args"); doJvmTest(fileName); } @TestMetadata("wrongAbiVersion.args") public void testWrongAbiVersion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args"); doJvmTest(fileName); } @TestMetadata("wrongAbiVersionNoErrors.args") public void testWrongAbiVersionNoErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersionNoErrors.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersionNoErrors.args"); doJvmTest(fileName); } @TestMetadata("wrongArgument.args") public void testWrongArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args"); doJvmTest(fileName); } @TestMetadata("wrongKotlinSignature.args") public void testWrongKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args"); doJvmTest(fileName); } @TestMetadata("wrongScriptWithNoSource.args") public void testWrongScriptWithNoSource() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args"); doJvmTest(fileName); } } @@ -265,120 +265,120 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes @RunWith(JUnit3RunnerWithInners.class) public static class Js extends AbstractKotlincExecutableTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false); } @TestMetadata("createMetadata.args") public void testCreateMetadata() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/createMetadata.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/createMetadata.args"); doJsTest(fileName); } @TestMetadata("diagnosticForClassLiteral.args") public void testDiagnosticForClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForClassLiteral.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForClassLiteral.args"); doJsTest(fileName); } @TestMetadata("diagnosticForUnhandledElements.args") public void testDiagnosticForUnhandledElements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForUnhandledElements.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForUnhandledElements.args"); doJsTest(fileName); } @TestMetadata("diagnosticWhenReferenceToBuiltinsMember.args") public void testDiagnosticWhenReferenceToBuiltinsMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticWhenReferenceToBuiltinsMember.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticWhenReferenceToBuiltinsMember.args"); doJsTest(fileName); } @TestMetadata("emptySources.args") public void testEmptySources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/emptySources.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/emptySources.args"); doJsTest(fileName); } @TestMetadata("inlineCycle.args") public void testInlineCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/inlineCycle.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/inlineCycle.args"); doJsTest(fileName); } @TestMetadata("jsExtraHelp.args") public void testJsExtraHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args"); doJsTest(fileName); } @TestMetadata("jsHelp.args") public void testJsHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args"); doJsTest(fileName); } @TestMetadata("libraryDirNotFound.args") public void testLibraryDirNotFound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/libraryDirNotFound.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/libraryDirNotFound.args"); doJsTest(fileName); } @TestMetadata("nonExistingSourcePath.args") public void testNonExistingSourcePath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/nonExistingSourcePath.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/nonExistingSourcePath.args"); doJsTest(fileName); } @TestMetadata("notValidLibraryDir.args") public void testNotValidLibraryDir() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/notValidLibraryDir.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/notValidLibraryDir.args"); doJsTest(fileName); } @TestMetadata("outputIsDirectory.args") public void testOutputIsDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputIsDirectory.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputIsDirectory.args"); doJsTest(fileName); } @TestMetadata("outputPostfixFileNotFound.args") public void testOutputPostfixFileNotFound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args"); doJsTest(fileName); } @TestMetadata("outputPrefixFileNotFound.args") public void testOutputPrefixFileNotFound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args"); doJsTest(fileName); } @TestMetadata("simple2js.args") public void testSimple2js() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args"); doJsTest(fileName); } @TestMetadata("suppressAllWarningsJS.args") public void testSuppressAllWarningsJS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args"); doJsTest(fileName); } @TestMetadata("withFolderAsLib.args") public void testWithFolderAsLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/withFolderAsLib.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/withFolderAsLib.args"); doJsTest(fileName); } @TestMetadata("withLib.args") public void testWithLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/withLib.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/withLib.args"); doJsTest(fileName); } @TestMetadata("wrongAbiVersion.args") public void testWrongAbiVersion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/wrongAbiVersion.args"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/wrongAbiVersion.args"); doJsTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 42470677216..334f1df63bd 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -19,9 +19,8 @@ package org.jetbrains.kotlin.code import com.intellij.openapi.util.io.FileUtil import junit.framework.TestCase import java.io.File -import java.util.ArrayList +import java.util.* import java.util.regex.Pattern -import kotlin.test.fail public class CodeConformanceTest : TestCase() { companion object { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt index 4228cffd2d8..087da316d85 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -38,7 +38,7 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() { visitor.text }.joinToString("\n\n") - JetTestUtils.assertEqualsToFile(txtFile, generatedFiles) + KotlinTestUtils.assertEqualsToFile(txtFile, generatedFiles) } private class TextCollectingVisitor : ClassVisitor(Opcodes.ASM5) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java index 2133301b1b5..ff2e73a39c2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.org.objectweb.asm.*; @@ -54,7 +54,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT @Override protected void setUp() throws Exception { super.setUp(); - jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable); + jetCoreEnvironment = KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable); } @Override @@ -67,7 +67,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT ktFile = new File(ktFileName); String text = FileUtil.loadFile(ktFile, true); - KtFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); + KtFile psiFile = KotlinTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetCoreEnvironment); @@ -95,7 +95,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT ClassReader cr = new ClassReader(outputFile.asByteArray()); List actualLocalVariables = readLocalVariable(cr, methodName); - JetTestUtils.assertEqualsToFile(ktFile, text.substring(0, text.indexOf("// VARIABLE : ")) + getActualVariablesAsString(actualLocalVariables)); + KotlinTestUtils.assertEqualsToFile(ktFile, text.substring(0, text.indexOf("// VARIABLE : ")) + getActualVariablesAsString(actualLocalVariables)); } private static String getActualVariablesAsString(List list) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index c4e1581ac86..010833a9412 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; @@ -51,15 +51,15 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { @NotNull private static String getTestDataPath() { - return JetTestUtils.getTestDataPathBase() + "/lineNumber"; + return KotlinTestUtils.getTestDataPathBase() + "/lineNumber"; } @NotNull private KotlinCoreEnvironment createEnvironment() { return KotlinCoreEnvironment.createForTests( myTestRootDisposable, - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - JetTestUtils.getAnnotationsJar(), tmpdir), + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, + KotlinTestUtils.getAnnotationsJar(), tmpdir), EnvironmentConfigFiles.JVM_CONFIG_FILES); } @@ -68,9 +68,9 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { super.setUp(); KotlinCoreEnvironment environment = createEnvironment(); - KtFile psiFile = JetTestUtils.createFile(LINE_NUMBER_FUN + ".kt", + KtFile psiFile = KotlinTestUtils.createFile(LINE_NUMBER_FUN + ".kt", "package test;\n\npublic fun " + LINE_NUMBER_FUN + "(): Int = 0\n", - environment.getProject()); + environment.getProject()); OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, environment); @@ -90,7 +90,7 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { throw ExceptionUtilsKt.rethrow(e); } - return new Pair(JetTestUtils.createFile(file.getName(), text, environment.getProject()), environment); + return new Pair(KotlinTestUtils.createFile(file.getName(), text, environment.getProject()), environment); } private void doTest(@NotNull String filename, boolean custom) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index 9abd6752a4e..4e85df06f7a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.MockLibraryUtil; import org.jetbrains.kotlin.test.TestJdkKind; @@ -68,13 +68,13 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte myEnvironment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - CollectionsKt.plus(classPath, JetTestUtils.getAnnotationsJar()), classPath), + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, + CollectionsKt.plus(classPath, KotlinTestUtils.getAnnotationsJar()), classPath), EnvironmentConfigFiles.JVM_CONFIG_FILES); loadFiles(ArrayUtil.toStringArray(sourceFiles)); - List expected = readExpectedOccurrences(JetTestUtils.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0)); + List expected = readExpectedOccurrences(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0)); countAndCompareActualOccurrences(expected); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java index 2a0606783c9..c6b78209071 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeListingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { public void testAllFilesPresentInBytecodeListing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultImpls.kt") public void testDefaultImpls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/defaultImpls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/defaultImpls.kt"); doTest(fileName); } @@ -46,36 +46,36 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBytecodeListingTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultTargets.kt") public void testDefaultTargets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/defaultTargets.kt"); doTest(fileName); } @TestMetadata("JvmSynthetic.kt") public void testJvmSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/JvmSynthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/JvmSynthetic.kt"); doTest(fileName); } @TestMetadata("literals.kt") public void testLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/literals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/literals.kt"); doTest(fileName); } @TestMetadata("onProperties.kt") public void testOnProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/onProperties.kt"); doTest(fileName); } @TestMetadata("onReceiver.kt") public void testOnReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/onReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/annotations/onReceiver.kt"); doTest(fileName); } } @@ -85,12 +85,12 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest { @RunWith(JUnit3RunnerWithInners.class) public static class SpecialBridges extends AbstractBytecodeListingTest { public void testAllFilesPresentInSpecialBridges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/specialBridges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/specialBridges/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeListing/specialBridges/contains.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextMultifileTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextMultifileTestGenerated.java index 5fb4a1a6bde..4f6d4edde62 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextMultifileTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextMultifileTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,30 +32,30 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BytecodeTextMultifileTestGenerated extends AbstractBytecodeTextTest { public void testAllFilesPresentInBytecodeTextMultifile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeTextMultifile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeTextMultifile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("inlineJavaStaticFields") public void testInlineJavaStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/inlineJavaStaticFields/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/inlineJavaStaticFields/"); doTestMultiFile(fileName); } @TestMetadata("javaStatics") public void testJavaStatics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/javaStatics/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/javaStatics/"); doTestMultiFile(fileName); } @TestMetadata("partMembersCall") public void testPartMembersCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/partMembersCall/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/partMembersCall/"); doTestMultiFile(fileName); } @TestMetadata("partMembersInline") public void testPartMembersInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/partMembersInline/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeTextMultifile/partMembersInline/"); doTestMultiFile(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index 1640608a930..df1a323bc25 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,227 +33,227 @@ import java.util.regex.Pattern; public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("accessorForProtected.kt") public void testAccessorForProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorForProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorForProtected.kt"); doTest(fileName); } @TestMetadata("accessorNaming.kt") public void testAccessorNaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorNaming.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorNaming.kt"); doTest(fileName); } public void testAllFilesPresentInBytecodeText() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationDefaultValue.kt") public void testAnnotationDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationDefaultValue.kt"); doTest(fileName); } @TestMetadata("annotationJavaRetentionPolicyRuntime.kt") public void testAnnotationJavaRetentionPolicyRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationJavaRetentionPolicyRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationJavaRetentionPolicyRuntime.kt"); doTest(fileName); } @TestMetadata("annotationRetentionPolicyClass.kt") public void testAnnotationRetentionPolicyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt"); doTest(fileName); } @TestMetadata("annotationRetentionPolicyRuntime.kt") public void testAnnotationRetentionPolicyRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt"); doTest(fileName); } @TestMetadata("annotationRetentionPolicySource.kt") public void testAnnotationRetentionPolicySource() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt"); doTest(fileName); } @TestMetadata("bridgeForFakeOverride.kt") public void testBridgeForFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt"); doTest(fileName); } @TestMetadata("callableReferenceInline.kt") public void testCallableReferenceInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/callableReferenceInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/callableReferenceInline.kt"); doTest(fileName); } @TestMetadata("componentEvaluatesOnlyOnce.kt") public void testComponentEvaluatesOnlyOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt"); doTest(fileName); } @TestMetadata("constClosureOptimization.kt") public void testConstClosureOptimization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt"); doTest(fileName); } @TestMetadata("constValsGetterDeprecated.kt") public void testConstValsGetterDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constValsGetterDeprecated.kt"); doTest(fileName); } @TestMetadata("inlineFromOtherModule.kt") public void testInlineFromOtherModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt"); doTest(fileName); } @TestMetadata("intConstantNotNull.kt") public void testIntConstantNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt"); doTest(fileName); } @TestMetadata("intConstantNullable.kt") public void testIntConstantNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullable.kt"); doTest(fileName); } @TestMetadata("intConstantNullableSafeCall.kt") public void testIntConstantNullableSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt"); doTest(fileName); } @TestMetadata("intConstantSafeCall.kt") public void testIntConstantSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt"); doTest(fileName); } @TestMetadata("interfaceDefaultImpl.kt") public void testInterfaceDefaultImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaceDefaultImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaceDefaultImpl.kt"); doTest(fileName); } @TestMetadata("isArrayOf.kt") public void testIsArrayOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/isArrayOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/isArrayOf.kt"); doTest(fileName); } @TestMetadata("javaExtensionPropertyIntrinsic.kt") public void testJavaExtensionPropertyIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/javaExtensionPropertyIntrinsic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/javaExtensionPropertyIntrinsic.kt"); doTest(fileName); } @TestMetadata("kt2202.kt") public void testKt2202() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2202.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2202.kt"); doTest(fileName); } @TestMetadata("kt2887.kt") public void testKt2887() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2887.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2887.kt"); doTest(fileName); } @TestMetadata("kt3845.kt") public void testKt3845() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt3845.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt3845.kt"); doTest(fileName); } @TestMetadata("kt5016.kt") public void testKt5016() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016.kt"); doTest(fileName); } @TestMetadata("kt5016int.kt") public void testKt5016int() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016int.kt"); doTest(fileName); } @TestMetadata("kt5016intOrNull.kt") public void testKt5016intOrNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt"); doTest(fileName); } @TestMetadata("kt7769.kt") public void testKt7769() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt7769.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt7769.kt"); doTest(fileName); } @TestMetadata("kt9603.kt") public void testKt9603() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt9603.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt9603.kt"); doTest(fileName); } @TestMetadata("noFlagAnnotations.kt") public void testNoFlagAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt"); doTest(fileName); } @TestMetadata("noWrapperForMethodReturningPrimitive.kt") public void testNoWrapperForMethodReturningPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt"); doTest(fileName); } @TestMetadata("prefixIntVarIncrement.kt") public void testPrefixIntVarIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/prefixIntVarIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/prefixIntVarIncrement.kt"); doTest(fileName); } @TestMetadata("privateDefaultArgs.kt") public void testPrivateDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt"); doTest(fileName); } @TestMetadata("redundantGotoRemoving.kt") public void testRedundantGotoRemoving() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt"); doTest(fileName); } @TestMetadata("redundantInitializer.kt") public void testRedundantInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantInitializer.kt"); doTest(fileName); } @TestMetadata("redundantInitializerNumber.kt") public void testRedundantInitializerNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantInitializerNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/redundantInitializerNumber.kt"); doTest(fileName); } @TestMetadata("safeAsWithMutable.kt") public void testSafeAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/safeAsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/safeAsWithMutable.kt"); doTest(fileName); } @TestMetadata("topLevelFunWithDefaultArgs.kt") public void testTopLevelFunWithDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt"); doTest(fileName); } @@ -262,30 +262,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class ArgumentOrder extends AbstractBytecodeTextTest { public void testAllFilesPresentInArgumentOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/argumentOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/argumentOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentReorder.kt") public void testArgumentReorder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorder.kt"); doTest(fileName); } @TestMetadata("argumentReorderWithDefault.kt") public void testArgumentReorderWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorderWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/argumentReorderWithDefault.kt"); doTest(fileName); } @TestMetadata("sameOrder.kt") public void testSameOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/sameOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/sameOrder.kt"); doTest(fileName); } @TestMetadata("sameOrderWithDefault.kt") public void testSameOrderWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/sameOrderWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/argumentOrder/sameOrderWithDefault.kt"); doTest(fileName); } } @@ -295,72 +295,72 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class BoxingOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInBoxingOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt"); doTest(fileName); } @TestMetadata("checkcastAndInstanceOf.kt") public void testCheckcastAndInstanceOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt"); doTest(fileName); } @TestMetadata("fold.kt") public void testFold() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt"); doTest(fileName); } @TestMetadata("nullCheck.kt") public void testNullCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt"); doTest(fileName); } @TestMetadata("progressions.kt") public void testProgressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt"); doTest(fileName); } @TestMetadata("safeCallWithElvis.kt") public void testSafeCallWithElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt"); doTest(fileName); } @TestMetadata("severalInlines.kt") public void testSeveralInlines() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt"); doTest(fileName); } @TestMetadata("unsafeRemoving.kt") public void testUnsafeRemoving() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt"); doTest(fileName); } @TestMetadata("variableClash.kt") public void testVariableClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt"); doTest(fileName); } @TestMetadata("variables.kt") public void testVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt"); doTest(fileName); } } @@ -370,30 +370,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class BuiltinFunctions extends AbstractBytecodeTextTest { public void testAllFilesPresentInBuiltinFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/builtinFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/builtinFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("charSequence.kt") public void testCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/charSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/charSequence.kt"); doTest(fileName); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/contains.kt"); doTest(fileName); } @TestMetadata("removeAt.kt") public void testRemoveAt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/removeAt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/removeAt.kt"); doTest(fileName); } @TestMetadata("size.kt") public void testSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/size.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/builtinFunctions/size.kt"); doTest(fileName); } } @@ -403,54 +403,54 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class Conditions extends AbstractBytecodeTextTest { public void testAllFilesPresentInConditions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/conditions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/conditions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conjuction.kt") public void testConjuction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/conjuction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/conjuction.kt"); doTest(fileName); } @TestMetadata("disjunction.kt") public void testDisjunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/disjunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/disjunction.kt"); doTest(fileName); } @TestMetadata("negatedConjuction.kt") public void testNegatedConjuction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedConjuction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedConjuction.kt"); doTest(fileName); } @TestMetadata("negatedDisjunction.kt") public void testNegatedDisjunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedDisjunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedDisjunction.kt"); doTest(fileName); } @TestMetadata("negatedNullCompare.kt") public void testNegatedNullCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedNullCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedNullCompare.kt"); doTest(fileName); } @TestMetadata("negatedZeroCompare.kt") public void testNegatedZeroCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedZeroCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/negatedZeroCompare.kt"); doTest(fileName); } @TestMetadata("nullCompare.kt") public void testNullCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/nullCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/nullCompare.kt"); doTest(fileName); } @TestMetadata("zeroCompare.kt") public void testZeroCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/zeroCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/conditions/zeroCompare.kt"); doTest(fileName); } } @@ -460,30 +460,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constants extends AbstractBytecodeTextTest { public void testAllFilesPresentInConstants() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/constants"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/constants"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("byte.kt") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/byte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/byte.kt"); doTest(fileName); } @TestMetadata("kt9532.kt") public void testKt9532() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/kt9532.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/kt9532.kt"); doTest(fileName); } @TestMetadata("nullableByteAndShort.kt") public void testNullableByteAndShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt"); doTest(fileName); } @TestMetadata("short.kt") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/short.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/short.kt"); doTest(fileName); } } @@ -493,48 +493,48 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeadCodeElimination extends AbstractBytecodeTextTest { public void testAllFilesPresentInDeadCodeElimination() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayConstructor.kt") public void testArrayConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/arrayConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/arrayConstructor.kt"); doTest(fileName); } @TestMetadata("boxing.kt") public void testBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt"); doTest(fileName); } @TestMetadata("emptyVariableRange.kt") public void testEmptyVariableRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/emptyVariableRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/emptyVariableRange.kt"); doTest(fileName); } @TestMetadata("lastReturn.kt") public void testLastReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/lastReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/lastReturn.kt"); doTest(fileName); } @TestMetadata("literal.kt") public void testLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/literal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/literal.kt"); doTest(fileName); } @TestMetadata("simpleConstructor.kt") public void testSimpleConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructor.kt"); doTest(fileName); } @TestMetadata("simpleConstructorNotRedundant.kt") public void testSimpleConstructorNotRedundant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt"); doTest(fileName); } } @@ -544,24 +544,24 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class DirectInvoke extends AbstractBytecodeTextTest { public void testAllFilesPresentInDirectInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/directInvoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/directInvoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callableReference.kt") public void testCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt"); doTest(fileName); } @TestMetadata("inplaceClosure.kt") public void testInplaceClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt"); doTest(fileName); } } @@ -571,30 +571,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class ForLoop extends AbstractBytecodeTextTest { public void testAllFilesPresentInForLoop() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/forLoop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/forLoop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("primitiveLiteralRange1.kt") public void testPrimitiveLiteralRange1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveLiteralRange1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveLiteralRange1.kt"); doTest(fileName); } @TestMetadata("primitiveLiteralRange2.kt") public void testPrimitiveLiteralRange2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveLiteralRange2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveLiteralRange2.kt"); doTest(fileName); } @TestMetadata("primitiveProgression.kt") public void testPrimitiveProgression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt"); doTest(fileName); } @TestMetadata("primitiveRange.kt") public void testPrimitiveRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/forLoop/primitiveRange.kt"); doTest(fileName); } } @@ -604,30 +604,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractBytecodeTextTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("notSplitedExceptionTable.kt") public void testNotSplitedExceptionTable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/notSplitedExceptionTable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/notSplitedExceptionTable.kt"); doTest(fileName); } @TestMetadata("reifiedSafeAsWithMutable.kt") public void testReifiedSafeAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/reifiedSafeAsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/reifiedSafeAsWithMutable.kt"); doTest(fileName); } @TestMetadata("removedFinallyMarkers.kt") public void testRemovedFinallyMarkers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/removedFinallyMarkers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/removedFinallyMarkers.kt"); doTest(fileName); } @TestMetadata("splitedExceptionTable.kt") public void testSplitedExceptionTable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/splitedExceptionTable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/splitedExceptionTable.kt"); doTest(fileName); } } @@ -637,30 +637,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class Interfaces extends AbstractBytecodeTextTest { public void testAllFilesPresentInInterfaces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/interfaces"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/interfaces"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("firstInheritedMethodIsAbstract.kt") public void testFirstInheritedMethodIsAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/firstInheritedMethodIsAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/firstInheritedMethodIsAbstract.kt"); doTest(fileName); } @TestMetadata("noAnyMethodsOnInterfaceInheritance.kt") public void testNoAnyMethodsOnInterfaceInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/noAnyMethodsOnInterfaceInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/noAnyMethodsOnInterfaceInheritance.kt"); doTest(fileName); } @TestMetadata("noPrivateMemberInJavaInterface.kt") public void testNoPrivateMemberInJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/noPrivateMemberInJavaInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/noPrivateMemberInJavaInterface.kt"); doTest(fileName); } @TestMetadata("traitImplGeneratedOnce.kt") public void testTraitImplGeneratedOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/traitImplGeneratedOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/interfaces/traitImplGeneratedOnce.kt"); doTest(fileName); } } @@ -670,42 +670,42 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class LazyCodegen extends AbstractBytecodeTextTest { public void testAllFilesPresentInLazyCodegen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("negateConst.kt") public void testNegateConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateConst.kt"); doTest(fileName); } @TestMetadata("negateConstantCompare.kt") public void testNegateConstantCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateConstantCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateConstantCompare.kt"); doTest(fileName); } @TestMetadata("negateObjectComp.kt") public void testNegateObjectComp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt"); doTest(fileName); } @TestMetadata("negateObjectCompChaing.kt") public void testNegateObjectCompChaing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt"); doTest(fileName); } @TestMetadata("negateVar.kt") public void testNegateVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateVar.kt"); doTest(fileName); } @TestMetadata("negateVarChain.kt") public void testNegateVarChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateVarChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lazyCodegen/negateVarChain.kt"); doTest(fileName); } } @@ -715,30 +715,30 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class LineNumbers extends AbstractBytecodeTextTest { public void testAllFilesPresentInLineNumbers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/lineNumbers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/lineNumbers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ifElse.kt") public void testIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/ifElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/ifElse.kt"); doTest(fileName); } @TestMetadata("singleThen.kt") public void testSingleThen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/singleThen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/singleThen.kt"); doTest(fileName); } @TestMetadata("tryCatch.kt") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/tryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/tryCatch.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/lineNumbers/when.kt"); doTest(fileName); } } @@ -748,54 +748,54 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class Statements extends AbstractBytecodeTextTest { public void testAllFilesPresentInStatements() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/statements"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/statements"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ifSingleBranch.kt") public void testIfSingleBranch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt"); doTest(fileName); } @TestMetadata("ifThenElse.kt") public void testIfThenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt"); doTest(fileName); } @TestMetadata("ifThenElseEmpty.kt") public void testIfThenElseEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt"); doTest(fileName); } @TestMetadata("labeled.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/labeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/labeled.kt"); doTest(fileName); } @TestMetadata("statementsComposition.kt") public void testStatementsComposition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/statementsComposition.kt"); doTest(fileName); } @TestMetadata("tryCatchFinally.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/when.kt"); doTest(fileName); } @TestMetadata("whenSubject.kt") public void testWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt"); doTest(fileName); } } @@ -805,24 +805,24 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class StaticFields extends AbstractBytecodeTextTest { public void testAllFilesPresentInStaticFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/classObject.kt"); doTest(fileName); } @TestMetadata("classObjectSyntheticAccessor.kt") public void testClassObjectSyntheticAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/classObjectSyntheticAccessor.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/staticFields/object.kt"); doTest(fileName); } } @@ -832,36 +832,36 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class StoreStackBeforeInline extends AbstractBytecodeTextTest { public void testAllFilesPresentInStoreStackBeforeInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/storeStackBeforeInline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/storeStackBeforeInline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentTypes.kt") public void testDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/differentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/differentTypes.kt"); doTest(fileName); } @TestMetadata("primitiveMerge.kt") public void testPrimitiveMerge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/primitiveMerge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/primitiveMerge.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/simple.kt"); doTest(fileName); } @TestMetadata("unreachableMarker.kt") public void testUnreachableMarker() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/unreachableMarker.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/unreachableMarker.kt"); doTest(fileName); } @TestMetadata("withLambda.kt") public void testWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/withLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/storeStackBeforeInline/withLambda.kt"); doTest(fileName); } } @@ -871,36 +871,36 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class StringOperations extends AbstractBytecodeTextTest { public void testAllFilesPresentInStringOperations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/stringOperations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/stringOperations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("concat.kt") public void testConcat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/concat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/concat.kt"); doTest(fileName); } @TestMetadata("infixPlus.kt") public void testInfixPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/infixPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/infixPlus.kt"); doTest(fileName); } @TestMetadata("interpolation.kt") public void testInterpolation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/interpolation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/interpolation.kt"); doTest(fileName); } @TestMetadata("plusAssign.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/plusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/plusAssign.kt"); doTest(fileName); } @TestMetadata("primitiveToString.kt") public void testPrimitiveToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/primitiveToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/stringOperations/primitiveToString.kt"); doTest(fileName); } } @@ -910,12 +910,12 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("integralWhenWithNoInlinedConstants.kt") public void testIntegralWhenWithNoInlinedConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt"); doTest(fileName); } } @@ -925,60 +925,60 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class WhenEnumOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhenEnumOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bigEnum.kt") public void testBigEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt"); doTest(fileName); } @TestMetadata("duplicatingItems.kt") public void testDuplicatingItems() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt"); doTest(fileName); } @TestMetadata("expression.kt") public void testExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt"); doTest(fileName); } @TestMetadata("functionLiteralInTopLevel.kt") public void testFunctionLiteralInTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt"); doTest(fileName); } @TestMetadata("manyWhensWithinClass.kt") public void testManyWhensWithinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt"); doTest(fileName); } @TestMetadata("nonConstantEnum.kt") public void testNonConstantEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt"); doTest(fileName); } @TestMetadata("nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt"); doTest(fileName); } @TestMetadata("subjectAny.kt") public void testSubjectAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt"); doTest(fileName); } @TestMetadata("withoutElse.kt") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt"); doTest(fileName); } } @@ -988,54 +988,54 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @RunWith(JUnit3RunnerWithInners.class) public static class WhenStringOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhenStringOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("denseHashCode.kt") public void testDenseHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt"); doTest(fileName); } @TestMetadata("duplicatingItems.kt") public void testDuplicatingItems() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt"); doTest(fileName); } @TestMetadata("duplicatingItemsSameHashCode.kt") public void testDuplicatingItemsSameHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt"); doTest(fileName); } @TestMetadata("expression.kt") public void testExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt"); doTest(fileName); } @TestMetadata("nonInlinedConst.kt") public void testNonInlinedConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt"); doTest(fileName); } @TestMetadata("nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt"); doTest(fileName); } @TestMetadata("sameHashCode.kt") public void testSameHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt"); doTest(fileName); } @TestMetadata("statement.kt") public void testStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java index 6a4d2a54392..c1a82391d07 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,66 +32,66 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest { public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("catchClause.kt") public void testCatchClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/catchClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/catchClause.kt"); doTest(fileName); } @TestMetadata("copyFunction.kt") public void testCopyFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/copyFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/copyFunction.kt"); doTest(fileName); } @TestMetadata("inlineLambdaWithItParam.kt") public void testInlineLambdaWithItParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt"); doTest(fileName); } @TestMetadata("inlineLambdaWithParam.kt") public void testInlineLambdaWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt"); doTest(fileName); } @TestMetadata("inlineSimple.kt") public void testInlineSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimple.kt"); doTest(fileName); } @TestMetadata("inlineSimpleChain.kt") public void testInlineSimpleChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt"); doTest(fileName); } @TestMetadata("itInLambda.kt") public void testItInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInLambda.kt"); doTest(fileName); } @TestMetadata("itInReturnedLambda.kt") public void testItInReturnedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt"); doTest(fileName); } @TestMetadata("lambdaAsVar.kt") public void testLambdaAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/localFun.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 52fe531d2b8..b3c34da94df 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -30,11 +30,9 @@ import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil; -import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.ClassReader; @@ -59,8 +57,8 @@ import java.util.List; import java.util.Map; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; -import static org.jetbrains.kotlin.test.JetTestUtils.compilerConfigurationForTests; -import static org.jetbrains.kotlin.test.JetTestUtils.getAnnotationsJar; +import static org.jetbrains.kotlin.test.KotlinTestUtils.compilerConfigurationForTests; +import static org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar; public abstract class CodegenTestCase extends UsefulTestCase { @@ -108,7 +106,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { @NotNull protected String loadFile(@NotNull @TestDataFile String name) { - return loadFileByFullPath(JetTestUtils.getTestDataPathBase() + "/codegen/" + name); + return loadFileByFullPath(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + name); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 9dbb6254426..8e858f5c719 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.Variance; @@ -82,17 +82,17 @@ public class CodegenTestFiles { } public static CodegenTestFiles create(Project project, String[] names) { - return create(project, names, JetTestUtils.getTestDataPathBase()); + return create(project, names, KotlinTestUtils.getTestDataPathBase()); } public static CodegenTestFiles create(Project project, String[] names, String testDataPath) { ArrayList files = new ArrayList(); for (String name : names) { try { - String content = JetTestUtils.doLoadFile(testDataPath + "/codegen/", name); + String content = KotlinTestUtils.doLoadFile(testDataPath + "/codegen/", name); int i = name.lastIndexOf('/'); //name = name.substring(i+1); - KtFile file = JetTestUtils.createFile(name, content, project); + KtFile file = KotlinTestUtils.createFile(name, content, project); files.add(file); } catch (IOException e) { throw new RuntimeException(e); @@ -104,7 +104,7 @@ public class CodegenTestFiles { @NotNull public static CodegenTestFiles create(@NotNull String fileName, @NotNull String contentWithDiagnosticMarkup, @NotNull Project project) { String content = CheckerTestUtil.parseDiagnosedRanges(contentWithDiagnosticMarkup, new ArrayList()); - KtFile file = JetTestUtils.createFile(fileName, content, project); + KtFile file = KotlinTestUtils.createFile(fileName, content, project); List ranges = AnalyzingUtils.getSyntaxErrorRanges(file); assert ranges.isEmpty() : "Syntax errors found in " + file + ": " + ranges; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index c4520620b07..ea6d400312a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -31,7 +31,7 @@ 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.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; @@ -120,11 +120,11 @@ public class CodegenTestUtil { @NotNull List additionalOptions ) { try { - File javaClassesTempDirectory = JetTestUtils.tmpDir("java-classes"); + File javaClassesTempDirectory = KotlinTestUtils.tmpDir("java-classes"); List classpath = new ArrayList(); classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath()); classpath.add(ForTestCompileRuntime.reflectJarForTests().getPath()); - classpath.add(JetTestUtils.getAnnotationsJar().getPath()); + classpath.add(KotlinTestUtils.getAnnotationsJar().getPath()); classpath.addAll(additionalClasspath); List options = new ArrayList(Arrays.asList( @@ -136,11 +136,11 @@ public class CodegenTestUtil { List fileList = Lists.transform(fileNames, new Function() { @Override public File apply(@Nullable String input) { - return new File(JetTestUtils.getTestDataPathBase() + "/codegen/" + input); + return new File(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + input); } }); - JetTestUtils.compileJavaFiles(fileList, options); + KotlinTestUtils.compileJavaFiles(fileList, options); return javaClassesTempDirectory; } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index e3ffd4cafd0..77f244bbe4f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; @@ -48,7 +48,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { } private void setUpEnvironment(boolean disableCallAssertions, boolean disableParamAssertions, File... extraClassPath) { - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, extraClassPath); configuration.put(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, disableCallAssertions); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java index 81cf994dd48..d434b0d8ed7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.junit.Test; @@ -39,7 +39,7 @@ public class JUnitUsageGenTest extends CodegenTestCase { myEnvironment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, junitJar), + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, junitJar), EnvironmentConfigFiles.JVM_CONFIG_FILES); } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java index 6c8e4156da9..944f1407d2b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,108 +34,108 @@ public class LineNumberTestGenerated extends AbstractLineNumberTest { @RunWith(JUnit3RunnerWithInners.class) public static class LineNumber extends AbstractLineNumberTest { public void testAllFilesPresentInLineNumber() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lineNumber"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lineNumber"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("anonymousFunction.kt") public void testAnonymousFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/anonymousFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/anonymousFunction.kt"); doTest(fileName); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/classObject.kt"); doTest(fileName); } @TestMetadata("defaultParameter.kt") public void testDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/defaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/defaultParameter.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/enum.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/for.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/if.kt"); doTest(fileName); } @TestMetadata("inlineSimpleCall.kt") public void testInlineSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/inlineSimpleCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/inlineSimpleCall.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/localFunction.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/object.kt"); doTest(fileName); } @TestMetadata("propertyAccessor.kt") public void testPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/propertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/propertyAccessor.kt"); doTest(fileName); } @TestMetadata("psvm.kt") public void testPsvm() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/psvm.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/psvm.kt"); doTest(fileName); } @TestMetadata("simpleSmap.kt") public void testSimpleSmap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/simpleSmap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/simpleSmap.kt"); doTest(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/topLevel.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/trait.kt"); doTest(fileName); } @TestMetadata("tryCatch.kt") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/tryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/tryCatch.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/while.kt"); doTest(fileName); } } @@ -145,126 +145,126 @@ public class LineNumberTestGenerated extends AbstractLineNumberTest { @RunWith(JUnit3RunnerWithInners.class) public static class Custom extends AbstractLineNumberTest { public void testAllFilesPresentInCustom() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lineNumber/custom"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lineNumber/custom"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callWithCallInArguments.kt") public void testCallWithCallInArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/callWithCallInArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/callWithCallInArguments.kt"); doTestCustom(fileName); } @TestMetadata("callWithReceiver.kt") public void testCallWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/callWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/callWithReceiver.kt"); doTestCustom(fileName); } @TestMetadata("chainCall.kt") public void testChainCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/chainCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/chainCall.kt"); doTestCustom(fileName); } @TestMetadata("compileTimeConstant.kt") public void testCompileTimeConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/compileTimeConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/compileTimeConstant.kt"); doTestCustom(fileName); } @TestMetadata("functionCallWithDefault.kt") public void testFunctionCallWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithDefault.kt"); doTestCustom(fileName); } @TestMetadata("functionCallWithInlinedLambdaParam.kt") public void testFunctionCallWithInlinedLambdaParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithInlinedLambdaParam.kt"); doTestCustom(fileName); } @TestMetadata("functionCallWithLambdaParam.kt") public void testFunctionCallWithLambdaParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithLambdaParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/functionCallWithLambdaParam.kt"); doTestCustom(fileName); } @TestMetadata("ifThen.kt") public void testIfThen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/ifThen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/ifThen.kt"); doTestCustom(fileName); } @TestMetadata("ifThenElse.kt") public void testIfThenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/ifThenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/ifThenElse.kt"); doTestCustom(fileName); } @TestMetadata("multilineFunctionCall.kt") public void testMultilineFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/multilineFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/multilineFunctionCall.kt"); doTestCustom(fileName); } @TestMetadata("multilineInfixCall.kt") public void testMultilineInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/multilineInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/multilineInfixCall.kt"); doTestCustom(fileName); } @TestMetadata("smapInlineAsArgument.kt") public void testSmapInlineAsArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsArgument.kt"); doTestCustom(fileName); } @TestMetadata("smapInlineAsInfixArgument.kt") public void testSmapInlineAsInfixArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsInfixArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsInfixArgument.kt"); doTestCustom(fileName); } @TestMetadata("smapInlineAsInlineArgument.kt") public void testSmapInlineAsInlineArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsInlineArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineAsInlineArgument.kt"); doTestCustom(fileName); } @TestMetadata("smapInlineInIntrinsicArgument.kt") public void testSmapInlineInIntrinsicArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineInIntrinsicArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/smapInlineInIntrinsicArgument.kt"); doTestCustom(fileName); } @TestMetadata("tryCatchExpression.kt") public void testTryCatchExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryCatchExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryCatchExpression.kt"); doTestCustom(fileName); } @TestMetadata("tryCatchFinally.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryCatchFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryCatchFinally.kt"); doTestCustom(fileName); } @TestMetadata("tryFinally.kt") public void testTryFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/tryFinally.kt"); doTestCustom(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/when.kt"); doTestCustom(fileName); } @TestMetadata("whenSubject.kt") public void testWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/whenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/lineNumber/custom/whenSubject.kt"); doTestCustom(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java index 19c990e9b47..c5834253187 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,102 +32,102 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest { public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true); } @TestMetadata("empty.kts") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/empty.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/empty.kts"); doTest(fileName); } @TestMetadata("helloWorld.kts") public void testHelloWorld() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/helloWorld.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/helloWorld.kts"); doTest(fileName); } @TestMetadata("inline.kts") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/inline.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/inline.kts"); doTest(fileName); } @TestMetadata("outerCapture.kts") public void testOuterCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/outerCapture.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/outerCapture.kts"); doTest(fileName); } @TestMetadata("parameter.kts") public void testParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameter.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/parameter.kts"); doTest(fileName); } @TestMetadata("parameterArray.kts") public void testParameterArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterArray.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterArray.kts"); doTest(fileName); } @TestMetadata("parameterClosure.kts") public void testParameterClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterClosure.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterClosure.kts"); doTest(fileName); } @TestMetadata("parameterLong.kts") public void testParameterLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterLong.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterLong.kts"); doTest(fileName); } @TestMetadata("secondLevelFunction.kts") public void testSecondLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunction.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunction.kts"); doTest(fileName); } @TestMetadata("secondLevelFunctionClosure.kts") public void testSecondLevelFunctionClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunctionClosure.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunctionClosure.kts"); doTest(fileName); } @TestMetadata("secondLevelVal.kts") public void testSecondLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelVal.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelVal.kts"); doTest(fileName); } @TestMetadata("simpleClass.kts") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/simpleClass.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/simpleClass.kts"); doTest(fileName); } @TestMetadata("string.kts") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/string.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/string.kts"); doTest(fileName); } @TestMetadata("topLevelFunction.kts") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunction.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunction.kts"); doTest(fileName); } @TestMetadata("topLevelFunctionClosure.kts") public void testTopLevelFunctionClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunctionClosure.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunctionClosure.kts"); doTest(fileName); } @TestMetadata("topLevelProperty.kts") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelProperty.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelProperty.kts"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 9ca76cbe745..12054088008 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.types.KotlinType; @@ -82,15 +82,15 @@ public class TestlibTest extends UsefulTestCase { public void setUp() throws Exception { super.setUp(); - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); - JvmContentRootsKt.addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KotlinTestUtils.getAnnotationsJar()); junitJar = new File("libraries/lib/junit-4.11.jar"); assertTrue(junitJar.exists()); JvmContentRootsKt.addJvmClasspathRoot(configuration, junitJar); - ContentRootsKt.addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/stdlib/test"); - ContentRootsKt.addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/kunit/src"); + ContentRootsKt.addKotlinSourceRoot(configuration, KotlinTestUtils.getHomeDirectory() + "/libraries/stdlib/test"); + ContentRootsKt.addKotlinSourceRoot(configuration, KotlinTestUtils.getHomeDirectory() + "/libraries/kunit/src"); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR); myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java index 6a5b607d9b3..c6f04fae0c7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest { public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("extensionFunction") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/"); doTest(fileName); } @TestMetadata("functionDifferentPackage") public void testFunctionDifferentPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/"); doTest(fileName); } @TestMetadata("functionInMultiFilePackage") public void testFunctionInMultiFilePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/"); doTest(fileName); } @TestMetadata("functionSamePackage") public void testFunctionSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/"); doTest(fileName); } @TestMetadata("property") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/property/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/property/"); doTest(fileName); } @TestMetadata("propertyWithGetter") public void testPropertyWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/"); doTest(fileName); } @TestMetadata("twoModules") public void testTwoModules() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/twoModules/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/twoModules/"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java index bf124d4e9a8..fb86b4e739f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.defaultConstructor; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,78 +32,78 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgumentsReflectionTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt"); doTest(fileName); } @TestMetadata("classInObject.kt") public void testClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt"); doTest(fileName); } @TestMetadata("classWithTwoDefaultArgs.kt") public void testClassWithTwoDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt"); doTest(fileName); } @TestMetadata("classWithVararg.kt") public void testClassWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/enum.kt"); doTest(fileName); } @TestMetadata("internalClass.kt") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt"); doTest(fileName); } @TestMetadata("privateClass.kt") public void testPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt"); doTest(fileName); } @TestMetadata("privateConstructor.kt") public void testPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt"); doTest(fileName); } @TestMetadata("publicClass.kt") public void testPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt"); doTest(fileName); } @TestMetadata("publicClassWoDefArgs.kt") public void testPublicClassWoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt"); doTest(fileName); } @TestMetadata("publicInnerClass.kt") public void testPublicInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt"); doTest(fileName); } @TestMetadata("publicInnerClassInPrivateClass.kt") public void testPublicInnerClassInPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java index 6de47ddb865..9d6445a1ec8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.org.objectweb.asm.*; import java.io.File; @@ -60,7 +60,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase { @Override public void setUp() throws Exception { super.setUp(); - jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_ONLY); + jetCoreEnvironment = KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable, ConfigurationKind.JDK_ONLY); } @Override @@ -75,7 +75,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase { String fileText = FileUtil.loadFile(ktFile, true); - KtFile psiFile = JetTestUtils.createFile(ktFile.getName(), fileText, jetCoreEnvironment.getProject()); + KtFile psiFile = KotlinTestUtils.createFile(ktFile.getName(), fileText, jetCoreEnvironment.getProject()); OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetCoreEnvironment); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java index 0db8ae31bd9..447154ffae2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.flags; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { public void testAllFilesPresentInWriteFlags() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/callableReference") @@ -40,7 +40,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractWriteFlagsTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/callableReference/visibility") @@ -48,30 +48,30 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/callableReference/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/callableReference/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionReference.kt") public void testFunctionReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/functionReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/functionReference.kt"); doTest(fileName); } @TestMetadata("functionReferenceInInlineFunction.kt") public void testFunctionReferenceInInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/functionReferenceInInlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/functionReferenceInInlineFunction.kt"); doTest(fileName); } @TestMetadata("propertyReference.kt") public void testPropertyReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/propertyReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/propertyReference.kt"); doTest(fileName); } @TestMetadata("propertyReferenceInInlineFunction.kt") public void testPropertyReferenceInInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/propertyReferenceInInlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/callableReference/visibility/propertyReferenceInInlineFunction.kt"); doTest(fileName); } } @@ -82,7 +82,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/class/accessFlags") @@ -90,36 +90,36 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class AccessFlags extends AbstractWriteFlagsTest { public void testAllFilesPresentInAccessFlags() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/accessFlags"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/accessFlags"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("objectLiteral.kt") public void testObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt"); doTest(fileName); } @TestMetadata("publicFinalClass.kt") public void testPublicFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt"); doTest(fileName); } @TestMetadata("publicFinalInnerClass.kt") public void testPublicFinalInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt"); doTest(fileName); } @TestMetadata("publicInnerInterface.kt") public void testPublicInnerInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt"); doTest(fileName); } @TestMetadata("publicInterface.kt") public void testPublicInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt"); doTest(fileName); } } @@ -129,36 +129,36 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt"); doTest(fileName); } @TestMetadata("enumClass.kt") public void testEnumClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt"); doTest(fileName); } } @@ -168,7 +168,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/class/visibility/internal") @@ -176,54 +176,54 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Internal extends AbstractWriteFlagsTest { public void testAllFilesPresentInInternal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/class.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/enum.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerObject.kt") public void testInnerObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt"); doTest(fileName); } @TestMetadata("innerTrait.kt") public void testInnerTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/object.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/trait.kt"); doTest(fileName); } } @@ -233,54 +233,54 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Private extends AbstractWriteFlagsTest { public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/class.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/enum.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerClass.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerObject.kt") public void testInnerObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerObject.kt"); doTest(fileName); } @TestMetadata("innerTrait.kt") public void testInnerTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/object.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/trait.kt"); doTest(fileName); } } @@ -290,54 +290,54 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Public extends AbstractWriteFlagsTest { public void testAllFilesPresentInPublic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/class.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/enum.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerClass.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerObject.kt") public void testInnerObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerObject.kt"); doTest(fileName); } @TestMetadata("innerTrait.kt") public void testInnerTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/object.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/trait.kt"); doTest(fileName); } } @@ -349,7 +349,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractWriteFlagsTest { public void testAllFilesPresentInDelegatedProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/delegatedProperty/visibility") @@ -357,12 +357,12 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/delegatedProperty/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/delegatedProperty/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("privateSet.kt") public void testPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/delegatedProperty/visibility/privateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/delegatedProperty/visibility/privateSet.kt"); doTest(fileName); } } @@ -373,7 +373,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractWriteFlagsTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/function/classObjectPrivate") @@ -381,24 +381,24 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassObjectPrivate extends AbstractWriteFlagsTest { public void testAllFilesPresentInClassObjectPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/classObjectPrivate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/classObjectPrivate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("privateFun.kt") public void testPrivateFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt"); doTest(fileName); } @TestMetadata("privateVal.kt") public void testPrivateVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt"); doTest(fileName); } @TestMetadata("privateVar.kt") public void testPrivateVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt"); doTest(fileName); } } @@ -408,30 +408,30 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructors extends AbstractWriteFlagsTest { public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/constructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/constructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/classObject.kt"); doTest(fileName); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectInClass.kt"); doTest(fileName); } @TestMetadata("objectLiteral.kt") public void testObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectLiteral.kt"); doTest(fileName); } @TestMetadata("topLevelObject.kt") public void testTopLevelObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/topLevelObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/topLevelObject.kt"); doTest(fileName); } } @@ -441,78 +441,78 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyGetter.kt") public void testEmptyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt"); doTest(fileName); } @TestMetadata("emptySetter.kt") public void testEmptySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt"); doTest(fileName); } @TestMetadata("extentionFun.kt") public void testExtentionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt"); doTest(fileName); } @TestMetadata("funInClass.kt") public void testFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt"); doTest(fileName); } @TestMetadata("funInClassObject.kt") public void testFunInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt"); doTest(fileName); } @TestMetadata("getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt"); doTest(fileName); } @TestMetadata("getterAnnotationOnProperty.kt") public void testGetterAnnotationOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt"); doTest(fileName); } @TestMetadata("getterForPropertyInConstructor.kt") public void testGetterForPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt"); doTest(fileName); } @TestMetadata("setterAnnotationOnProperty.kt") public void testSetterAnnotationOnProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt"); doTest(fileName); } @TestMetadata("setterForPropertyInConstructor.kt") public void testSetterForPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("topLevelFun.kt") public void testTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt"); doTest(fileName); } } @@ -523,24 +523,24 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Hidden extends AbstractWriteFlagsTest { public void testAllFilesPresentInHidden() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/hidden"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/hidden"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/function.kt"); doTest(fileName); } @TestMetadata("propertyGetter.kt") public void testPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/propertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/propertyGetter.kt"); doTest(fileName); } @TestMetadata("propertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/propertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/hidden/propertySetter.kt"); doTest(fileName); } } @@ -550,7 +550,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class InnerClass extends AbstractWriteFlagsTest { public void testAllFilesPresentInInnerClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/innerClass/visibility") @@ -558,42 +558,42 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internal.kt") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internal.kt"); doTest(fileName); } @TestMetadata("internalClassObject.kt") public void testInternalClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt"); doTest(fileName); } @TestMetadata("private.kt") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/private.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/private.kt"); doTest(fileName); } @TestMetadata("privateClassObject.kt") public void testPrivateClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt"); doTest(fileName); } @TestMetadata("public.kt") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/public.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/public.kt"); doTest(fileName); } @TestMetadata("publicClassObject.kt") public void testPublicClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt"); doTest(fileName); } } @@ -604,7 +604,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractWriteFlagsTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/property/classObject") @@ -612,7 +612,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractWriteFlagsTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/property/classObject/class") @@ -620,108 +620,108 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegatedProtectedVar.kt") public void testDelegatedProtectedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt"); doTest(fileName); } @TestMetadata("delegatedPublicVal.kt") public void testDelegatedPublicVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt"); doTest(fileName); } @TestMetadata("internalVal.kt") public void testInternalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVal.kt"); doTest(fileName); } @TestMetadata("internalVar.kt") public void testInternalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVar.kt"); doTest(fileName); } @TestMetadata("internalVarPrivateSet.kt") public void testInternalVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("noBackingField.kt") public void testNoBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt"); doTest(fileName); } @TestMetadata("privateVal.kt") public void testPrivateVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVal.kt"); doTest(fileName); } @TestMetadata("privateVar.kt") public void testPrivateVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVar.kt"); doTest(fileName); } @TestMetadata("protectedVal.kt") public void testProtectedVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt"); doTest(fileName); } @TestMetadata("protectedVarPrivateSet.kt") public void testProtectedVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("publicVal.kt") public void testPublicVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVal.kt"); doTest(fileName); } @TestMetadata("publicValNonDefault.kt") public void testPublicValNonDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt"); doTest(fileName); } @TestMetadata("publicVar.kt") public void testPublicVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVar.kt"); doTest(fileName); } @TestMetadata("publicVarNonDefault.kt") public void testPublicVarNonDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt"); doTest(fileName); } @TestMetadata("publicVarPrivateSet.kt") public void testPublicVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("publicVarProtectedSet.kt") public void testPublicVarProtectedSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt"); doTest(fileName); } @TestMetadata("publicVarPublicSet.kt") public void testPublicVarPublicSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt"); doTest(fileName); } } @@ -731,30 +731,30 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Rename extends AbstractWriteFlagsTest { public void testAllFilesPresentInRename() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorAndClassObject.kt") public void testConstructorAndClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt"); doTest(fileName); } @TestMetadata("delegatedAndDelegated.kt") public void testDelegatedAndDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt"); doTest(fileName); } @TestMetadata("delegatedAndProperty.kt") public void testDelegatedAndProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt"); doTest(fileName); } @TestMetadata("propertyAndProperty.kt") public void testPropertyAndProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt"); doTest(fileName); } } @@ -764,120 +764,120 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Trait extends AbstractWriteFlagsTest { public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/trait"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/trait"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegatedProtectedVar.kt") public void testDelegatedProtectedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt"); doTest(fileName); } @TestMetadata("delegatedPublicVal.kt") public void testDelegatedPublicVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt"); doTest(fileName); } @TestMetadata("internalConstVal.kt") public void testInternalConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt"); doTest(fileName); } @TestMetadata("internalVal.kt") public void testInternalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt"); doTest(fileName); } @TestMetadata("internalVar.kt") public void testInternalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt"); doTest(fileName); } @TestMetadata("internalVarPrivateSet.kt") public void testInternalVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("noBackingField.kt") public void testNoBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt"); doTest(fileName); } @TestMetadata("privateVal.kt") public void testPrivateVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt"); doTest(fileName); } @TestMetadata("privateVar.kt") public void testPrivateVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt"); doTest(fileName); } @TestMetadata("protectedVal.kt") public void testProtectedVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt"); doTest(fileName); } @TestMetadata("protectedVarPrivateSet.kt") public void testProtectedVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("publicConstVal.kt") public void testPublicConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicConstVal.kt"); doTest(fileName); } @TestMetadata("publicVal.kt") public void testPublicVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt"); doTest(fileName); } @TestMetadata("publicValNonDefault.kt") public void testPublicValNonDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt"); doTest(fileName); } @TestMetadata("publicVar.kt") public void testPublicVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt"); doTest(fileName); } @TestMetadata("publicVarNonDefault.kt") public void testPublicVarNonDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt"); doTest(fileName); } @TestMetadata("publicVarPrivateSet.kt") public void testPublicVarPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt"); doTest(fileName); } @TestMetadata("publicVarProtectedSet.kt") public void testPublicVarProtectedSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt"); doTest(fileName); } @TestMetadata("publicVarPublicSet.kt") public void testPublicVarPublicSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt"); doTest(fileName); } } @@ -888,18 +888,18 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("propertyInClass.kt") public void testPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt"); doTest(fileName); } @TestMetadata("topLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt"); doTest(fileName); } } @@ -909,24 +909,24 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internal.kt") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/internal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/internal.kt"); doTest(fileName); } @TestMetadata("private.kt") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/private.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/private.kt"); doTest(fileName); } @TestMetadata("public.kt") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/public.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/public.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index f2c5b9086c8..4d7f3aa6e33 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; @@ -71,7 +71,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { FilesKt.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT" ) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL; - myEnvironment = JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( + myEnvironment = KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( getTestRootDisposable(), configurationKind, getTestJdkKind(filename) ); @@ -118,8 +118,8 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { myEnvironment = KotlinCoreEnvironment.createForTests( getTestRootDisposable(), - JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.ALL, getTestJdkKind(ktFileFullPath), JetTestUtils.getAnnotationsJar(), javaClassesTempDirectory + KotlinTestUtils.compilerConfigurationForTests( + ConfigurationKind.ALL, getTestJdkKind(ktFileFullPath), KotlinTestUtils.getAnnotationsJar(), javaClassesTempDirectory ), EnvironmentConfigFiles.JVM_CONFIG_FILES ); @@ -147,8 +147,8 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } }); - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar() + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( + ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar() ); JvmContentRootsKt.addJavaSourceRoot(configuration, dirFile); myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); @@ -156,7 +156,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { classFileFactory = GenerationUtils.compileManyFilesGetGenerationStateForTest(myEnvironment.getProject(), myFiles.getPsiFiles(), new JvmPackagePartProvider(myEnvironment)).getFactory(); - File kotlinOut = JetTestUtils.tmpDir(toString()); + File kotlinOut = KotlinTestUtils.tmpDir(toString()); OutputUtilsKt.writeAllTo(classFileFactory, kotlinOut); List javacOptions = new ArrayList(0); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java index fe52df32d4a..7dda666a3ad 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxAgainstJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxAgainstJava/annotations") @@ -40,54 +40,54 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaAnnotationArrayValueDefault.kt") public void testJavaAnnotationArrayValueDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueDefault.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationArrayValueNoDefault.kt") public void testJavaAnnotationArrayValueNoDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationArrayValueNoDefault.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationCall.kt") public void testJavaAnnotationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationDefault.kt") public void testJavaAnnotationDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaNegativePropertyAsAnnotationParameter.kt") public void testJavaNegativePropertyAsAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaPropertyAsAnnotationParameter.kt") public void testJavaPropertyAsAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaPropertyWithIntInitializer.kt") public void testJavaPropertyWithIntInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt"); doTestAgainstJava(fileName); } @TestMetadata("retentionInJava.kt") public void testRetentionInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt"); doTestAgainstJava(fileName); } @@ -96,42 +96,42 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class KClassMapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInKClassMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayClassParameter.kt") public void testArrayClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("arrayClassParameterOnJavaClass.kt") public void testArrayClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("classParameter.kt") public void testClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("classParameterOnJavaClass.kt") public void testClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("varargClassParameter.kt") public void testVarargClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("varargClassParameterOnJavaClass.kt") public void testVarargClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } } @@ -141,30 +141,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class ObsoleteAnnotationMethodsUsages extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObsoleteAnnotationMethodsUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaAnnotationArrayValueDefault.kt") public void testJavaAnnotationArrayValueDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueDefault.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationArrayValueNoDefault.kt") public void testJavaAnnotationArrayValueNoDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationArrayValueNoDefault.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationCall.kt") public void testJavaAnnotationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationCall.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaAnnotationDefault.kt") public void testJavaAnnotationDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/javaAnnotationDefault.kt"); doTestAgainstJava(fileName); } @@ -173,42 +173,42 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class KClassMapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInKClassMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayClassParameter.kt") public void testArrayClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("arrayClassParameterOnJavaClass.kt") public void testArrayClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/arrayClassParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("classParameter.kt") public void testClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("classParameterOnJavaClass.kt") public void testClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/classParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("varargClassParameter.kt") public void testVarargClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameter.kt"); doTestAgainstJava(fileName); } @TestMetadata("varargClassParameterOnJavaClass.kt") public void testVarargClassParameterOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/obsoleteAnnotationMethodsUsages/kClassMapping/varargClassParameterOnJavaClass.kt"); doTestAgainstJava(fileName); } } @@ -220,30 +220,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("publicFinalField.kt") public void testPublicFinalField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt"); doTestAgainstJava(fileName); } @TestMetadata("publicMutableField.kt") public void testPublicMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt"); doTestAgainstJava(fileName); } @TestMetadata("staticMethod.kt") public void testStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/staticMethod.kt"); doTestAgainstJava(fileName); } } @@ -253,18 +253,18 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericConstructor.kt") public void testGenericConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/secondaryConstructor.kt"); doTestAgainstJava(fileName); } } @@ -274,12 +274,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Delegation extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDelegation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegationAndInheritanceFromJava.kt") public void testDelegationAndInheritanceFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt"); doTestAgainstJava(fileName); } } @@ -289,42 +289,42 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleJavaEnum.kt") public void testSimpleJavaEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleJavaEnumWithFunction.kt") public void testSimpleJavaEnumWithFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleJavaEnumWithStaticImport.kt") public void testSimpleJavaEnumWithStaticImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleJavaInnerEnum.kt") public void testSimpleJavaInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt"); doTestAgainstJava(fileName); } @TestMetadata("staticField.kt") public void testStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt"); doTestAgainstJava(fileName); } @TestMetadata("staticMethod.kt") public void testStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt"); doTestAgainstJava(fileName); } } @@ -334,36 +334,36 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("max.kt") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/max.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/max.kt"); doTestAgainstJava(fileName); } @TestMetadata("referencesStaticInnerClassMethod.kt") public void testReferencesStaticInnerClassMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt"); doTestAgainstJava(fileName); } @TestMetadata("referencesStaticInnerClassMethodL2.kt") public void testReferencesStaticInnerClassMethodL2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt"); doTestAgainstJava(fileName); } @TestMetadata("unrelatedUpperBounds.kt") public void testUnrelatedUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt"); doTestAgainstJava(fileName); } } @@ -373,24 +373,24 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class InnerClass extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt3532.kt") public void testKt3532() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt"); doTestAgainstJava(fileName); } @TestMetadata("kt3812.kt") public void testKt3812() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt"); doTestAgainstJava(fileName); } @TestMetadata("kt4036.kt") public void testKt4036() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt"); doTestAgainstJava(fileName); } } @@ -400,12 +400,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Interfaces extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInterfaces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/interfaces"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/interfaces"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inheritJavaInterface.kt") public void testInheritJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/interfaces/inheritJavaInterface.kt"); doTestAgainstJava(fileName); } } @@ -415,18 +415,18 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class NotNullAssertions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNotNullAssertions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/notNullAssertions/Delegation.kt"); doTestAgainstJava(fileName); } @TestMetadata("RightElvisOperand.kt") public void testRightElvisOperand() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/notNullAssertions/RightElvisOperand.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/notNullAssertions/RightElvisOperand.kt"); doTestAgainstJava(fileName); } } @@ -436,12 +436,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("GenericUnit.kt") public void testGenericUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/platformTypes/GenericUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/platformTypes/GenericUnit.kt"); doTestAgainstJava(fileName); } } @@ -451,24 +451,24 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt"); doTestAgainstJava(fileName); } @TestMetadata("fieldAccessViaSubclass.kt") public void testFieldAccessViaSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt"); doTestAgainstJava(fileName); } @TestMetadata("referenceToJavaFieldViaBridge.kt") public void testReferenceToJavaFieldViaBridge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/referenceToJavaFieldViaBridge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/referenceToJavaFieldViaBridge.kt"); doTestAgainstJava(fileName); } } @@ -478,7 +478,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection/classLiterals") @@ -486,12 +486,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class ClassLiterals extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClassLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/classLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/classLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaClassLiteral.kt") public void testJavaClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/classLiterals/javaClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/classLiterals/javaClassLiteral.kt"); doTestAgainstJava(fileName); } } @@ -501,30 +501,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Mapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jClass2kClass.kt") public void testJClass2kClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaConstructor.kt") public void testJavaConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaConstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaFields.kt") public void testJavaFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt"); doTestAgainstJava(fileName); } @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaMethods.kt"); doTestAgainstJava(fileName); } } @@ -534,12 +534,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("equalsHashCodeToString.kt") public void testEqualsHashCodeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/properties/equalsHashCodeToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/properties/equalsHashCodeToString.kt"); doTestAgainstJava(fileName); } } @@ -550,30 +550,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Sam extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentFqNames.kt") public void testDifferentFqNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt"); doTestAgainstJava(fileName); } @TestMetadata("kt4753.kt") public void testKt4753() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/kt4753.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/kt4753.kt"); doTestAgainstJava(fileName); } @TestMetadata("kt4753_2.kt") public void testKt4753_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/kt4753_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/kt4753_2.kt"); doTestAgainstJava(fileName); } @TestMetadata("samConstructorGenericSignature.kt") public void testSamConstructorGenericSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt"); doTestAgainstJava(fileName); } @@ -582,174 +582,174 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Adapters extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bridgesForOverridden.kt") public void testBridgesForOverridden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/bridgesForOverridden.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/bridgesForOverridden.kt"); doTestAgainstJava(fileName); } @TestMetadata("bridgesForOverriddenComplex.kt") public void testBridgesForOverriddenComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/bridgesForOverriddenComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/bridgesForOverriddenComplex.kt"); doTestAgainstJava(fileName); } @TestMetadata("callAbstractAdapter.kt") public void testCallAbstractAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt"); doTestAgainstJava(fileName); } @TestMetadata("comparator.kt") public void testComparator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt"); doTestAgainstJava(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("doubleLongParameters.kt") public void testDoubleLongParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/doubleLongParameters.kt"); doTestAgainstJava(fileName); } @TestMetadata("fileFilter.kt") public void testFileFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt"); doTestAgainstJava(fileName); } @TestMetadata("genericSignature.kt") public void testGenericSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt"); doTestAgainstJava(fileName); } @TestMetadata("implementAdapter.kt") public void testImplementAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt"); doTestAgainstJava(fileName); } @TestMetadata("inheritedInKotlin.kt") public void testInheritedInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt"); doTestAgainstJava(fileName); } @TestMetadata("inheritedOverriddenAdapter.kt") public void testInheritedOverriddenAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt"); doTestAgainstJava(fileName); } @TestMetadata("inheritedSimple.kt") public void testInheritedSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt"); doTestAgainstJava(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("localObjectConstructor.kt") public void testLocalObjectConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("localObjectConstructorWithFnValue.kt") public void testLocalObjectConstructorWithFnValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructorWithFnValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructorWithFnValue.kt"); doTestAgainstJava(fileName); } @TestMetadata("nonLiteralAndLiteralRunnable.kt") public void testNonLiteralAndLiteralRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt"); doTestAgainstJava(fileName); } @TestMetadata("nonLiteralComparator.kt") public void testNonLiteralComparator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt"); doTestAgainstJava(fileName); } @TestMetadata("nonLiteralInConstructor.kt") public void testNonLiteralInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("nonLiteralNull.kt") public void testNonLiteralNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt"); doTestAgainstJava(fileName); } @TestMetadata("nonLiteralRunnable.kt") public void testNonLiteralRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt"); doTestAgainstJava(fileName); } @TestMetadata("protectedFromBase.kt") public void testProtectedFromBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/protectedFromBase.kt"); doTestAgainstJava(fileName); } @TestMetadata("severalSamParameters.kt") public void testSeveralSamParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt"); doTestAgainstJava(fileName); } @TestMetadata("simplest.kt") public void testSimplest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt"); doTestAgainstJava(fileName); } @TestMetadata("superconstructor.kt") public void testSuperconstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("superconstructorWithClosure.kt") public void testSuperconstructorWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt"); doTestAgainstJava(fileName); } @TestMetadata("typeParameterOfClass.kt") public void testTypeParameterOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("typeParameterOfMethod.kt") public void testTypeParameterOfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt"); doTestAgainstJava(fileName); } @TestMetadata("typeParameterOfOuterClass.kt") public void testTypeParameterOfOuterClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt"); doTestAgainstJava(fileName); } @@ -758,78 +758,78 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Operators extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperators() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("augmentedAssignmentAndSquareBrackets.kt") public void testAugmentedAssignmentAndSquareBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt"); doTestAgainstJava(fileName); } @TestMetadata("augmentedAssignmentPure.kt") public void testAugmentedAssignmentPure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt"); doTestAgainstJava(fileName); } @TestMetadata("augmentedAssignmentViaSimpleBinary.kt") public void testAugmentedAssignmentViaSimpleBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt"); doTestAgainstJava(fileName); } @TestMetadata("binary.kt") public void testBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt"); doTestAgainstJava(fileName); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt"); doTestAgainstJava(fileName); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt"); doTestAgainstJava(fileName); } @TestMetadata("get.kt") public void testGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt"); doTestAgainstJava(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt"); doTestAgainstJava(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt"); doTestAgainstJava(fileName); } @TestMetadata("multiGetSet.kt") public void testMultiGetSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt"); doTestAgainstJava(fileName); } @TestMetadata("multiInvoke.kt") public void testMultiInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt"); doTestAgainstJava(fileName); } @TestMetadata("set.kt") public void testSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt"); doTestAgainstJava(fileName); } } @@ -841,12 +841,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class StaticFun extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithNestedEnum.kt") public void testClassWithNestedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt"); doTestAgainstJava(fileName); } } @@ -856,54 +856,54 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class SyntheticExtensions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSyntheticExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fromTwoBases.kt") public void testFromTwoBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/fromTwoBases.kt"); doTestAgainstJava(fileName); } @TestMetadata("getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/getter.kt"); doTestAgainstJava(fileName); } @TestMetadata("implicitReceiver.kt") public void testImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/implicitReceiver.kt"); doTestAgainstJava(fileName); } @TestMetadata("overrideOnlyGetter.kt") public void testOverrideOnlyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/overrideOnlyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/overrideOnlyGetter.kt"); doTestAgainstJava(fileName); } @TestMetadata("plusPlus.kt") public void testPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/plusPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/plusPlus.kt"); doTestAgainstJava(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/setter.kt"); doTestAgainstJava(fileName); } @TestMetadata("_protected.kt") public void test_protected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/_protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/_protected.kt"); doTestAgainstJava(fileName); } @TestMetadata("_protectedSetter.kt") public void test_protectedSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/_protectedSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/syntheticExtensions/_protectedSetter.kt"); doTestAgainstJava(fileName); } } @@ -913,7 +913,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package") @@ -921,30 +921,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class Package extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2781.kt") public void testKt2781() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt"); doTestAgainstJava(fileName); } @TestMetadata("packageClass.kt") public void testPackageClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("packageFun.kt") public void testPackageFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt"); doTestAgainstJava(fileName); } @TestMetadata("packageProperty.kt") public void testPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt"); doTestAgainstJava(fileName); } } @@ -954,30 +954,30 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedAndPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("overrideProtectedFunInPackage.kt") public void testOverrideProtectedFunInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); doTestAgainstJava(fileName); } @TestMetadata("protectedFunInPackage.kt") public void testProtectedFunInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt"); doTestAgainstJava(fileName); } @TestMetadata("protectedPropertyInPackage.kt") public void testProtectedPropertyInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); doTestAgainstJava(fileName); } @TestMetadata("protectedStaticClass.kt") public void testProtectedStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt"); doTestAgainstJava(fileName); } } @@ -987,78 +987,78 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funCallInConstructor.kt") public void testFunCallInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt"); doTestAgainstJava(fileName); } @TestMetadata("funClassObject.kt") public void testFunClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt"); doTestAgainstJava(fileName); } @TestMetadata("funGenericClass.kt") public void testFunGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("funNestedStaticClass.kt") public void testFunNestedStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("funNestedStaticClass2.kt") public void testFunNestedStaticClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt"); doTestAgainstJava(fileName); } @TestMetadata("funNestedStaticGenericClass.kt") public void testFunNestedStaticGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("funNotDirectSuperClass.kt") public void testFunNotDirectSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("funObject.kt") public void testFunObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleClass2.kt") public void testSimpleClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleFun.kt") public void testSimpleFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt"); doTestAgainstJava(fileName); } @TestMetadata("simpleProperty.kt") public void testSimpleProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt"); doTestAgainstJava(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index 19156793f6b..0854ed12165 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBox() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/argumentOrder") @@ -40,72 +40,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ArgumentOrder extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArgumentOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/argumentOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/argumentOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arguments.kt") public void testArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/arguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/arguments.kt"); doTest(fileName); } @TestMetadata("captured.kt") public void testCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/captured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/captured.kt"); doTest(fileName); } @TestMetadata("capturedInExtension.kt") public void testCapturedInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/capturedInExtension.kt"); doTest(fileName); } @TestMetadata("defaults.kt") public void testDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/defaults.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/defaults.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extension.kt"); doTest(fileName); } @TestMetadata("extensionInClass.kt") public void testExtensionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extensionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/extensionInClass.kt"); doTest(fileName); } @TestMetadata("kt9277.kt") public void testKt9277() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/kt9277.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/kt9277.kt"); doTest(fileName); } @TestMetadata("lambdaMigration.kt") public void testLambdaMigration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/lambdaMigration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/lambdaMigration.kt"); doTest(fileName); } @TestMetadata("lambdaMigrationInClass.kt") public void testLambdaMigrationInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/lambdaMigrationInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/lambdaMigrationInClass.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/simple.kt"); doTest(fileName); } @TestMetadata("simpleInClass.kt") public void testSimpleInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/simpleInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/argumentOrder/simpleInClass.kt"); doTest(fileName); } } @@ -115,204 +115,204 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Arrays extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArrays() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayInstanceOf.kt") public void testArrayInstanceOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayInstanceOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayInstanceOf.kt"); doTest(fileName); } @TestMetadata("arrayPlusAssign.kt") public void testArrayPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt"); doTest(fileName); } @TestMetadata("collectionAssignGetMultiIndex.kt") public void testCollectionAssignGetMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt"); doTest(fileName); } @TestMetadata("collectionGetMultiIndex.kt") public void testCollectionGetMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt"); doTest(fileName); } @TestMetadata("forEachBooleanArray.kt") public void testForEachBooleanArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachBooleanArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachBooleanArray.kt"); doTest(fileName); } @TestMetadata("forEachByteArray.kt") public void testForEachByteArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachByteArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachByteArray.kt"); doTest(fileName); } @TestMetadata("forEachCharArray.kt") public void testForEachCharArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachCharArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachCharArray.kt"); doTest(fileName); } @TestMetadata("forEachDoubleArray.kt") public void testForEachDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachDoubleArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachDoubleArray.kt"); doTest(fileName); } @TestMetadata("forEachFloatArray.kt") public void testForEachFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachFloatArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachFloatArray.kt"); doTest(fileName); } @TestMetadata("forEachIntArray.kt") public void testForEachIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachIntArray.kt"); doTest(fileName); } @TestMetadata("forEachLongArray.kt") public void testForEachLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachLongArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachLongArray.kt"); doTest(fileName); } @TestMetadata("forEachShortArray.kt") public void testForEachShortArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachShortArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachShortArray.kt"); doTest(fileName); } @TestMetadata("hashMap.kt") public void testHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt"); doTest(fileName); } @TestMetadata("iteratorBooleanArray.kt") public void testIteratorBooleanArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt"); doTest(fileName); } @TestMetadata("iteratorByteArray.kt") public void testIteratorByteArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArray.kt"); doTest(fileName); } @TestMetadata("iteratorByteArrayNextByte.kt") public void testIteratorByteArrayNextByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt"); doTest(fileName); } @TestMetadata("iteratorCharArray.kt") public void testIteratorCharArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorCharArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorCharArray.kt"); doTest(fileName); } @TestMetadata("iteratorDoubleArray.kt") public void testIteratorDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt"); doTest(fileName); } @TestMetadata("iteratorFloatArray.kt") public void testIteratorFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorFloatArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorFloatArray.kt"); doTest(fileName); } @TestMetadata("iteratorIntArray.kt") public void testIteratorIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorIntArray.kt"); doTest(fileName); } @TestMetadata("iteratorLongArray.kt") public void testIteratorLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArray.kt"); doTest(fileName); } @TestMetadata("iteratorLongArrayNextLong.kt") public void testIteratorLongArrayNextLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt"); doTest(fileName); } @TestMetadata("iteratorShortArray.kt") public void testIteratorShortArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorShortArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorShortArray.kt"); doTest(fileName); } @TestMetadata("kt238.kt") public void testKt238() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt238.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt238.kt"); doTest(fileName); } @TestMetadata("kt2997.kt") public void testKt2997() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt2997.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt2997.kt"); doTest(fileName); } @TestMetadata("kt33.kt") public void testKt33() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt33.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt33.kt"); doTest(fileName); } @TestMetadata("kt4348.kt") public void testKt4348() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4348.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4348.kt"); doTest(fileName); } @TestMetadata("kt503.kt") public void testKt503() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt503.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt503.kt"); doTest(fileName); } @TestMetadata("kt594.kt") public void testKt594() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt594.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt594.kt"); doTest(fileName); } @TestMetadata("kt7288.kt") public void testKt7288() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt7288.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt7288.kt"); doTest(fileName); } @TestMetadata("kt779.kt") public void testKt779() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt779.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt779.kt"); doTest(fileName); } @TestMetadata("kt950.kt") public void testKt950() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt950.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt950.kt"); doTest(fileName); } @TestMetadata("longAsIndex.kt") public void testLongAsIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/longAsIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/longAsIndex.kt"); doTest(fileName); } } @@ -322,90 +322,90 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class BinaryOp extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBinaryOp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/binaryOp"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/binaryOp"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/call.kt"); doTest(fileName); } @TestMetadata("callAny.kt") public void testCallAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/callAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/callAny.kt"); doTest(fileName); } @TestMetadata("callNullable.kt") public void testCallNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/callNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/callNullable.kt"); doTest(fileName); } @TestMetadata("divisionByZero.kt") public void testDivisionByZero() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/divisionByZero.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/divisionByZero.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCall.kt"); doTest(fileName); } @TestMetadata("infixCallAny.kt") public void testInfixCallAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCallAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCallAny.kt"); doTest(fileName); } @TestMetadata("infixCallNullable.kt") public void testInfixCallNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCallNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCallNullable.kt"); doTest(fileName); } @TestMetadata("intrinsic.kt") public void testIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsic.kt"); doTest(fileName); } @TestMetadata("intrinsicAny.kt") public void testIntrinsicAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsicAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsicAny.kt"); doTest(fileName); } @TestMetadata("intrinsicNullable.kt") public void testIntrinsicNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt"); doTest(fileName); } @TestMetadata("kt6747_identityEquals.kt") public void testKt6747_identityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/kt6747_identityEquals.kt"); doTest(fileName); } @TestMetadata("overflowChar.kt") public void testOverflowChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowChar.kt"); doTest(fileName); } @TestMetadata("overflowInt.kt") public void testOverflowInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowInt.kt"); doTest(fileName); } @TestMetadata("overflowLong.kt") public void testOverflowLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/overflowLong.kt"); doTest(fileName); } } @@ -415,252 +415,252 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Bridges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBridges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("complexMultiInheritance.kt") public void testComplexMultiInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt"); doTest(fileName); } @TestMetadata("complexTraitImpl.kt") public void testComplexTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexTraitImpl.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegation.kt"); doTest(fileName); } @TestMetadata("delegationProperty.kt") public void testDelegationProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegationProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegationProperty.kt"); doTest(fileName); } @TestMetadata("diamond.kt") public void testDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/diamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/diamond.kt"); doTest(fileName); } @TestMetadata("fakeCovariantOverride.kt") public void testFakeCovariantOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt"); doTest(fileName); } @TestMetadata("fakeGenericCovariantOverride.kt") public void testFakeGenericCovariantOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt"); doTest(fileName); } @TestMetadata("fakeGenericCovariantOverrideWithDelegation.kt") public void testFakeGenericCovariantOverrideWithDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverrideWithDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverrideWithDelegation.kt"); doTest(fileName); } @TestMetadata("fakeOverrideOfTraitImpl.kt") public void testFakeOverrideOfTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt"); doTest(fileName); } @TestMetadata("fakeOverrideWithSeveralSuperDeclarations.kt") public void testFakeOverrideWithSeveralSuperDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt"); doTest(fileName); } @TestMetadata("fakeOverrideWithSynthesizedImplementation.kt") public void testFakeOverrideWithSynthesizedImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt"); doTest(fileName); } @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/genericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/genericProperty.kt"); doTest(fileName); } @TestMetadata("kt1939.kt") public void testKt1939() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1939.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1939.kt"); doTest(fileName); } @TestMetadata("kt1959.kt") public void testKt1959() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1959.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1959.kt"); doTest(fileName); } @TestMetadata("kt2498.kt") public void testKt2498() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2498.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2498.kt"); doTest(fileName); } @TestMetadata("kt2702.kt") public void testKt2702() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2702.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2702.kt"); doTest(fileName); } @TestMetadata("kt2833.kt") public void testKt2833() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2833.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2833.kt"); doTest(fileName); } @TestMetadata("kt2920.kt") public void testKt2920() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2920.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2920.kt"); doTest(fileName); } @TestMetadata("kt318.kt") public void testKt318() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt318.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt318.kt"); doTest(fileName); } @TestMetadata("longChainOneBridge.kt") public void testLongChainOneBridge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/longChainOneBridge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/longChainOneBridge.kt"); doTest(fileName); } @TestMetadata("manyTypeArgumentsSubstitutedSuccessively.kt") public void testManyTypeArgumentsSubstitutedSuccessively() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt"); doTest(fileName); } @TestMetadata("methodFromTrait.kt") public void testMethodFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/methodFromTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/methodFromTrait.kt"); doTest(fileName); } @TestMetadata("noBridgeOnMutableCollectionInheritance.kt") public void testNoBridgeOnMutableCollectionInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt"); doTest(fileName); } @TestMetadata("objectClone.kt") public void testObjectClone() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/objectClone.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/objectClone.kt"); doTest(fileName); } @TestMetadata("overrideAbstractProperty.kt") public void testOverrideAbstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt"); doTest(fileName); } @TestMetadata("overrideReturnType.kt") public void testOverrideReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideReturnType.kt"); doTest(fileName); } @TestMetadata("propertyAccessorsWithoutBody.kt") public void testPropertyAccessorsWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt"); doTest(fileName); } @TestMetadata("propertyDiamond.kt") public void testPropertyDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyDiamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyDiamond.kt"); doTest(fileName); } @TestMetadata("propertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyInConstructor.kt"); doTest(fileName); } @TestMetadata("propertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertySetter.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simple.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleEnum.kt"); doTest(fileName); } @TestMetadata("simpleGenericMethod.kt") public void testSimpleGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt"); doTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleObject.kt"); doTest(fileName); } @TestMetadata("simpleReturnType.kt") public void testSimpleReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleReturnType.kt"); doTest(fileName); } @TestMetadata("simpleTraitImpl.kt") public void testSimpleTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt"); doTest(fileName); } @TestMetadata("simpleUpperBound.kt") public void testSimpleUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleUpperBound.kt"); doTest(fileName); } @TestMetadata("strListContains.kt") public void testStrListContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/strListContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/strListContains.kt"); doTest(fileName); } @TestMetadata("traitImplInheritsTraitImpl.kt") public void testTraitImplInheritsTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt"); doTest(fileName); } @TestMetadata("twoParentsWithDifferentMethodsTwoBridges.kt") public void testTwoParentsWithDifferentMethodsTwoBridges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt"); doTest(fileName); } @TestMetadata("twoParentsWithTheSameMethodOneBridge.kt") public void testTwoParentsWithTheSameMethodOneBridge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt"); doTest(fileName); } @@ -670,59 +670,59 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class SubstitutionInSuperClass extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractFun.kt") public void testAbstractFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt"); doTest(fileName); } public void testAllFilesPresentInSubstitutionInSuperClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges/substitutionInSuperClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges/substitutionInSuperClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boundedTypeArguments.kt") public void testBoundedTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt"); doTest(fileName); } @TestMetadata("genericMethod.kt") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt"); doTest(fileName); } @TestMetadata("upperBound.kt") public void testUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt"); doTest(fileName); } } @@ -734,119 +734,119 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractMember.kt") public void testAbstractMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/abstractMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/abstractMember.kt"); doTest(fileName); } public void testAllFilesPresentInBuiltinStubMethods() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Collection.kt") public void testCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Collection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Collection.kt"); doTest(fileName); } @TestMetadata("delegationToArrayList.kt") public void testDelegationToArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/delegationToArrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/delegationToArrayList.kt"); doTest(fileName); } @TestMetadata("implementationInTrait.kt") public void testImplementationInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/implementationInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/implementationInTrait.kt"); doTest(fileName); } @TestMetadata("inheritedImplementations.kt") public void testInheritedImplementations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/inheritedImplementations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/inheritedImplementations.kt"); doTest(fileName); } @TestMetadata("Iterator.kt") public void testIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Iterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Iterator.kt"); doTest(fileName); } @TestMetadata("IteratorWithRemove.kt") public void testIteratorWithRemove() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/IteratorWithRemove.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/IteratorWithRemove.kt"); doTest(fileName); } @TestMetadata("List.kt") public void testList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/List.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/List.kt"); doTest(fileName); } @TestMetadata("ListIterator.kt") public void testListIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListIterator.kt"); doTest(fileName); } @TestMetadata("ListWithAllImplementations.kt") public void testListWithAllImplementations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllImplementations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllImplementations.kt"); doTest(fileName); } @TestMetadata("ListWithAllInheritedImplementations.kt") public void testListWithAllInheritedImplementations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllInheritedImplementations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllInheritedImplementations.kt"); doTest(fileName); } @TestMetadata("manyTypeParametersWithUpperBounds.kt") public void testManyTypeParametersWithUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/manyTypeParametersWithUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/manyTypeParametersWithUpperBounds.kt"); doTest(fileName); } @TestMetadata("Map.kt") public void testMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Map.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Map.kt"); doTest(fileName); } @TestMetadata("MapEntry.kt") public void testMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntry.kt"); doTest(fileName); } @TestMetadata("MapEntryWithSetValue.kt") public void testMapEntryWithSetValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntryWithSetValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntryWithSetValue.kt"); doTest(fileName); } @TestMetadata("MapWithAllImplementations.kt") public void testMapWithAllImplementations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt"); doTest(fileName); } @TestMetadata("nonTrivialSubstitution.kt") public void testNonTrivialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/nonTrivialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/nonTrivialSubstitution.kt"); doTest(fileName); } @TestMetadata("nonTrivialUpperBound.kt") public void testNonTrivialUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/nonTrivialUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/nonTrivialUpperBound.kt"); doTest(fileName); } @TestMetadata("SubstitutedList.kt") public void testSubstitutedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/SubstitutedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/SubstitutedList.kt"); doTest(fileName); } @@ -856,41 +856,41 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class ExtendJavaCollections extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractList.kt") public void testAbstractList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractList.kt"); doTest(fileName); } @TestMetadata("abstractMap.kt") public void testAbstractMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractMap.kt"); doTest(fileName); } @TestMetadata("abstractSet.kt") public void testAbstractSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/abstractSet.kt"); doTest(fileName); } public void testAllFilesPresentInExtendJavaCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/arrayList.kt"); doTest(fileName); } @TestMetadata("hashMap.kt") public void testHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashMap.kt"); doTest(fileName); } @TestMetadata("hashSet.kt") public void testHashSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt"); doTest(fileName); } } @@ -901,54 +901,54 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class BuiltinsProperties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBuiltinsProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinsProperties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinsProperties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bridges.kt") public void testBridges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/bridges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/bridges.kt"); doTest(fileName); } @TestMetadata("collectionImpl.kt") public void testCollectionImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/collectionImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/collectionImpl.kt"); doTest(fileName); } @TestMetadata("enumAsOrdinaled.kt") public void testEnumAsOrdinaled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/enumAsOrdinaled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/enumAsOrdinaled.kt"); doTest(fileName); } @TestMetadata("explicitSuperCall.kt") public void testExplicitSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/explicitSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/explicitSuperCall.kt"); doTest(fileName); } @TestMetadata("irrelevantRemoveAtOverride.kt") public void testIrrelevantRemoveAtOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/irrelevantRemoveAtOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/irrelevantRemoveAtOverride.kt"); doTest(fileName); } @TestMetadata("maps.kt") public void testMaps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/maps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/maps.kt"); doTest(fileName); } @TestMetadata("throwable.kt") public void testThrowable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/throwable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/throwable.kt"); doTest(fileName); } @TestMetadata("valuesInsideEnum.kt") public void testValuesInsideEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/valuesInsideEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinsProperties/valuesInsideEnum.kt"); doTest(fileName); } } @@ -958,84 +958,84 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/casts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/casts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("as.kt") public void testAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/as.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/as.kt"); doTest(fileName); } @TestMetadata("asForConstants.kt") public void testAsForConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asForConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asForConstants.kt"); doTest(fileName); } @TestMetadata("asSafe.kt") public void testAsSafe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafe.kt"); doTest(fileName); } @TestMetadata("asSafeFail.kt") public void testAsSafeFail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeFail.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeFail.kt"); doTest(fileName); } @TestMetadata("asSafeForConstants.kt") public void testAsSafeForConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeForConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeForConstants.kt"); doTest(fileName); } @TestMetadata("asUnit.kt") public void testAsUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asUnit.kt"); doTest(fileName); } @TestMetadata("castGenericNull.kt") public void testCastGenericNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/castGenericNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/castGenericNull.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/is.kt"); doTest(fileName); } @TestMetadata("lambdaToUnitCast.kt") public void testLambdaToUnitCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/lambdaToUnitCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/lambdaToUnitCast.kt"); doTest(fileName); } @TestMetadata("notIs.kt") public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/notIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/notIs.kt"); doTest(fileName); } @TestMetadata("unitAsAny.kt") public void testUnitAsAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitAsAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitAsAny.kt"); doTest(fileName); } @TestMetadata("unitAsSafeAny.kt") public void testUnitAsSafeAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitAsSafeAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitAsSafeAny.kt"); doTest(fileName); } @TestMetadata("unitNullableCast.kt") public void testUnitNullableCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitNullableCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/unitNullableCast.kt"); doTest(fileName); } } @@ -1045,642 +1045,642 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boxPrimitiveTypeInClinitOfClassObject.kt") public void testBoxPrimitiveTypeInClinitOfClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt"); doTest(fileName); } @TestMetadata("classNamedAsOldPackageFacade.kt") public void testClassNamedAsOldPackageFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classNamedAsOldPackageFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classNamedAsOldPackageFacade.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObject.kt"); doTest(fileName); } @TestMetadata("classObjectAsExtensionReceiver.kt") public void testClassObjectAsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("classObjectAsStaticInitializer.kt") public void testClassObjectAsStaticInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt"); doTest(fileName); } @TestMetadata("classObjectField.kt") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectField.kt"); doTest(fileName); } @TestMetadata("classObjectInTrait.kt") public void testClassObjectInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectInTrait.kt"); doTest(fileName); } @TestMetadata("classObjectNotOfEnum.kt") public void testClassObjectNotOfEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt"); doTest(fileName); } @TestMetadata("classObjectToString.kt") public void testClassObjectToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt"); doTest(fileName); } @TestMetadata("classObjectWithPrivateGenericMember.kt") public void testClassObjectWithPrivateGenericMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt"); doTest(fileName); } @TestMetadata("classObjectsWithParentClasses.kt") public void testClassObjectsWithParentClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt"); doTest(fileName); } @TestMetadata("defaultObjectSameNamesAsInOuter.kt") public void testDefaultObjectSameNamesAsInOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/defaultObjectSameNamesAsInOuter.kt"); doTest(fileName); } @TestMetadata("delegation2.kt") public void testDelegation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation2.kt"); doTest(fileName); } @TestMetadata("delegation3.kt") public void testDelegation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation3.kt"); doTest(fileName); } @TestMetadata("delegation4.kt") public void testDelegation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation4.kt"); doTest(fileName); } @TestMetadata("delegationGenericArg.kt") public void testDelegationGenericArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArg.kt"); doTest(fileName); } @TestMetadata("delegationGenericArgUpperBound.kt") public void testDelegationGenericArgUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt"); doTest(fileName); } @TestMetadata("delegationGenericLongArg.kt") public void testDelegationGenericLongArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericLongArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericLongArg.kt"); doTest(fileName); } @TestMetadata("delegationJava.kt") public void testDelegationJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationJava.kt"); doTest(fileName); } @TestMetadata("delegationMethodsWithArgs.kt") public void testDelegationMethodsWithArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt"); doTest(fileName); } @TestMetadata("exceptionConstructor.kt") public void testExceptionConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/exceptionConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/exceptionConstructor.kt"); doTest(fileName); } @TestMetadata("extensionOnNamedClassObject.kt") public void testExtensionOnNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/extensionOnNamedClassObject.kt"); doTest(fileName); } @TestMetadata("funDelegation.kt") public void testFunDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/funDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/funDelegation.kt"); doTest(fileName); } @TestMetadata("inheritSetAndHashSet.kt") public void testInheritSetAndHashSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt"); doTest(fileName); } @TestMetadata("inheritance.kt") public void testInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritance.kt"); doTest(fileName); } @TestMetadata("inheritedInnerClass.kt") public void testInheritedInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedInnerClass.kt"); doTest(fileName); } @TestMetadata("inheritedMethod.kt") public void testInheritedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedMethod.kt"); doTest(fileName); } @TestMetadata("initializerBlock.kt") public void testInitializerBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlock.kt"); doTest(fileName); } @TestMetadata("initializerBlockDImpl.kt") public void testInitializerBlockDImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlockDImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlockDImpl.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/innerClass.kt"); doTest(fileName); } @TestMetadata("kt1018.kt") public void testKt1018() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1018.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1018.kt"); doTest(fileName); } @TestMetadata("kt1120.kt") public void testKt1120() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt"); doTest(fileName); } @TestMetadata("kt1134.kt") public void testKt1134() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1134.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1134.kt"); doTest(fileName); } @TestMetadata("kt1157.kt") public void testKt1157() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1157.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1157.kt"); doTest(fileName); } @TestMetadata("kt1247.kt") public void testKt1247() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1247.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1247.kt"); doTest(fileName); } @TestMetadata("kt1345.kt") public void testKt1345() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1345.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1345.kt"); doTest(fileName); } @TestMetadata("kt1439.kt") public void testKt1439() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1439.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1439.kt"); doTest(fileName); } @TestMetadata("kt1535.kt") public void testKt1535() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1535.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1535.kt"); doTest(fileName); } @TestMetadata("kt1538.kt") public void testKt1538() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1538.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1538.kt"); doTest(fileName); } @TestMetadata("kt1578.kt") public void testKt1578() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1578.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1578.kt"); doTest(fileName); } @TestMetadata("kt1611.kt") public void testKt1611() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1611.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1611.kt"); doTest(fileName); } @TestMetadata("kt1721.kt") public void testKt1721() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1721.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1721.kt"); doTest(fileName); } @TestMetadata("kt1726.kt") public void testKt1726() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1726.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1726.kt"); doTest(fileName); } @TestMetadata("kt1759.kt") public void testKt1759() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1759.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1759.kt"); doTest(fileName); } @TestMetadata("kt1891.kt") public void testKt1891() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1891.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1891.kt"); doTest(fileName); } @TestMetadata("kt1918.kt") public void testKt1918() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1918.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1918.kt"); doTest(fileName); } @TestMetadata("kt1976.kt") public void testKt1976() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1976.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1976.kt"); doTest(fileName); } @TestMetadata("kt1980.kt") public void testKt1980() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1980.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1980.kt"); doTest(fileName); } @TestMetadata("kt2224.kt") public void testKt2224() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2224.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2224.kt"); doTest(fileName); } @TestMetadata("kt2288.kt") public void testKt2288() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2288.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2288.kt"); doTest(fileName); } @TestMetadata("kt2384.kt") public void testKt2384() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2384.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2384.kt"); doTest(fileName); } @TestMetadata("kt2390.kt") public void testKt2390() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2390.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2390.kt"); doTest(fileName); } @TestMetadata("kt2391.kt") public void testKt2391() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2391.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2391.kt"); doTest(fileName); } @TestMetadata("kt2395.kt") public void testKt2395() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2395.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2395.kt"); doTest(fileName); } @TestMetadata("kt2417.kt") public void testKt2417() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2417.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2417.kt"); doTest(fileName); } @TestMetadata("kt2477.kt") public void testKt2477() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2477.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2477.kt"); doTest(fileName); } @TestMetadata("kt2480.kt") public void testKt2480() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2480.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2480.kt"); doTest(fileName); } @TestMetadata("kt2482.kt") public void testKt2482() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2482.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2482.kt"); doTest(fileName); } @TestMetadata("kt2485.kt") public void testKt2485() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2485.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2485.kt"); doTest(fileName); } @TestMetadata("kt249.kt") public void testKt249() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt249.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt249.kt"); doTest(fileName); } @TestMetadata("kt2532.kt") public void testKt2532() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2532.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2532.kt"); doTest(fileName); } @TestMetadata("kt2566.kt") public void testKt2566() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566.kt"); doTest(fileName); } @TestMetadata("kt2566_2.kt") public void testKt2566_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566_2.kt"); doTest(fileName); } @TestMetadata("kt2607.kt") public void testKt2607() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2607.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2607.kt"); doTest(fileName); } @TestMetadata("kt2626.kt") public void testKt2626() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2626.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2626.kt"); doTest(fileName); } @TestMetadata("kt2711.kt") public void testKt2711() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2711.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2711.kt"); doTest(fileName); } @TestMetadata("kt2784.kt") public void testKt2784() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2784.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2784.kt"); doTest(fileName); } @TestMetadata("kt285.kt") public void testKt285() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt285.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt285.kt"); doTest(fileName); } @TestMetadata("kt3001.kt") public void testKt3001() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3001.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3001.kt"); doTest(fileName); } @TestMetadata("kt3114.kt") public void testKt3114() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3114.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3114.kt"); doTest(fileName); } @TestMetadata("kt3414.kt") public void testKt3414() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3414.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3414.kt"); doTest(fileName); } @TestMetadata("kt343.kt") public void testKt343() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt343.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt343.kt"); doTest(fileName); } @TestMetadata("kt3546.kt") public void testKt3546() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3546.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3546.kt"); doTest(fileName); } @TestMetadata("kt454.kt") public void testKt454() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt454.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt454.kt"); doTest(fileName); } @TestMetadata("kt48.kt") public void testKt48() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt"); doTest(fileName); } @TestMetadata("kt496.kt") public void testKt496() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt496.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt496.kt"); doTest(fileName); } @TestMetadata("kt500.kt") public void testKt500() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt500.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt500.kt"); doTest(fileName); } @TestMetadata("kt501.kt") public void testKt501() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt501.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt501.kt"); doTest(fileName); } @TestMetadata("kt504.kt") public void testKt504() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt504.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt504.kt"); doTest(fileName); } @TestMetadata("kt508.kt") public void testKt508() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt508.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt508.kt"); doTest(fileName); } @TestMetadata("kt5347.kt") public void testKt5347() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt5347.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt5347.kt"); doTest(fileName); } @TestMetadata("kt6136.kt") public void testKt6136() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6136.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6136.kt"); doTest(fileName); } @TestMetadata("kt6816.kt") public void testKt6816() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6816.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt6816.kt"); doTest(fileName); } @TestMetadata("kt707.kt") public void testKt707() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt"); doTest(fileName); } @TestMetadata("kt723.kt") public void testKt723() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt723.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt723.kt"); doTest(fileName); } @TestMetadata("kt725.kt") public void testKt725() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt725.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt725.kt"); doTest(fileName); } @TestMetadata("kt8011a.kt") public void testKt8011a() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt8011a.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt8011a.kt"); doTest(fileName); } @TestMetadata("kt903.kt") public void testKt903() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt903.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt903.kt"); doTest(fileName); } @TestMetadata("kt940.kt") public void testKt940() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt940.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt940.kt"); doTest(fileName); } @TestMetadata("kt9642.kt") public void testKt9642() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt9642.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt9642.kt"); doTest(fileName); } @TestMetadata("namedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/namedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/namedClassObject.kt"); doTest(fileName); } @TestMetadata("outerThis.kt") public void testOuterThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/outerThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/outerThis.kt"); doTest(fileName); } @TestMetadata("overloadBinaryOperator.kt") public void testOverloadBinaryOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadBinaryOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadBinaryOperator.kt"); doTest(fileName); } @TestMetadata("overloadPlusAssign.kt") public void testOverloadPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssign.kt"); doTest(fileName); } @TestMetadata("overloadPlusAssignReturn.kt") public void testOverloadPlusAssignReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt"); doTest(fileName); } @TestMetadata("overloadPlusToPlusAssign.kt") public void testOverloadPlusToPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt"); doTest(fileName); } @TestMetadata("overloadUnaryOperator.kt") public void testOverloadUnaryOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadUnaryOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadUnaryOperator.kt"); doTest(fileName); } @TestMetadata("privateOuterFunctions.kt") public void testPrivateOuterFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterFunctions.kt"); doTest(fileName); } @TestMetadata("privateOuterProperty.kt") public void testPrivateOuterProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterProperty.kt"); doTest(fileName); } @TestMetadata("privateToThis.kt") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateToThis.kt"); doTest(fileName); } @TestMetadata("propertyDelegation.kt") public void testPropertyDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyDelegation.kt"); doTest(fileName); } @TestMetadata("propertyInInitializer.kt") public void testPropertyInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyInInitializer.kt"); doTest(fileName); } @TestMetadata("rightHandOverride.kt") public void testRightHandOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/rightHandOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/rightHandOverride.kt"); doTest(fileName); } @TestMetadata("selfcreate.kt") public void testSelfcreate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/selfcreate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/selfcreate.kt"); doTest(fileName); } @TestMetadata("simpleBox.kt") public void testSimpleBox() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/simpleBox.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/simpleBox.kt"); doTest(fileName); } @TestMetadata("typedDelegation.kt") public void testTypedDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/typedDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/typedDelegation.kt"); doTest(fileName); } @@ -1689,42 +1689,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Inner extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInner() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes/inner"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes/inner"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("instantiateInDerived.kt") public void testInstantiateInDerived() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInDerived.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInDerived.kt"); doTest(fileName); } @TestMetadata("instantiateInDerivedLabeled.kt") public void testInstantiateInDerivedLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInDerivedLabeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInDerivedLabeled.kt"); doTest(fileName); } @TestMetadata("instantiateInSameClass.kt") public void testInstantiateInSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInSameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/instantiateInSameClass.kt"); doTest(fileName); } @TestMetadata("kt6708.kt") public void testKt6708() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/kt6708.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/kt6708.kt"); doTest(fileName); } @TestMetadata("properOuter.kt") public void testProperOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/properOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/properOuter.kt"); doTest(fileName); } @TestMetadata("properSuperLinking.kt") public void testProperSuperLinking() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/properSuperLinking.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inner/properSuperLinking.kt"); doTest(fileName); } } @@ -1735,114 +1735,114 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Closures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("captureExtensionReceiver.kt") public void testCaptureExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("capturedLocalGenericFun.kt") public void testCapturedLocalGenericFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt"); doTest(fileName); } @TestMetadata("closureInsideConstrucor.kt") public void testClosureInsideConstrucor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt"); doTest(fileName); } @TestMetadata("closureOnTopLevel1.kt") public void testClosureOnTopLevel1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel1.kt"); doTest(fileName); } @TestMetadata("closureOnTopLevel2.kt") public void testClosureOnTopLevel2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel2.kt"); doTest(fileName); } @TestMetadata("closureWithParameter.kt") public void testClosureWithParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameter.kt"); doTest(fileName); } @TestMetadata("closureWithParameterAndBoxing.kt") public void testClosureWithParameterAndBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt"); doTest(fileName); } @TestMetadata("doubleEnclosedLocalVariable.kt") public void testDoubleEnclosedLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt"); doTest(fileName); } @TestMetadata("enclosingLocalVariable.kt") public void testEnclosingLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt"); doTest(fileName); } @TestMetadata("enclosingThis.kt") public void testEnclosingThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingThis.kt"); doTest(fileName); } @TestMetadata("extensionClosure.kt") public void testExtensionClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/extensionClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/extensionClosure.kt"); doTest(fileName); } @TestMetadata("kt2151.kt") public void testKt2151() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt2151.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt2151.kt"); doTest(fileName); } @TestMetadata("kt3152.kt") public void testKt3152() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3152.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3152.kt"); doTest(fileName); } @TestMetadata("kt3523.kt") public void testKt3523() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3523.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3523.kt"); doTest(fileName); } @TestMetadata("kt3738.kt") public void testKt3738() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3738.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3738.kt"); doTest(fileName); } @TestMetadata("kt3905.kt") public void testKt3905() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3905.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3905.kt"); doTest(fileName); } @TestMetadata("kt4106.kt") public void testKt4106() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4106.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4106.kt"); doTest(fileName); } @TestMetadata("kt4137.kt") public void testKt4137() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4137.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4137.kt"); doTest(fileName); } @@ -1854,67 +1854,67 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("localClassFunClosure.kt") public void testLocalClassFunClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassFunClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassFunClosure.kt"); doTest(fileName); } @TestMetadata("localClassLambdaClosure.kt") public void testLocalClassLambdaClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassLambdaClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localClassLambdaClosure.kt"); doTest(fileName); } @TestMetadata("localFunctionInFunction.kt") public void testLocalFunctionInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInFunction.kt"); doTest(fileName); } @TestMetadata("localFunctionInInitializer.kt") public void testLocalFunctionInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt"); doTest(fileName); } @TestMetadata("localGenericFun.kt") public void testLocalGenericFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localGenericFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localGenericFun.kt"); doTest(fileName); } @TestMetadata("localReturn.kt") public void testLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturn.kt"); doTest(fileName); } @TestMetadata("localReturnWithAutolabel.kt") public void testLocalReturnWithAutolabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt"); doTest(fileName); } @TestMetadata("recursiveClosure.kt") public void testRecursiveClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/recursiveClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/recursiveClosure.kt"); doTest(fileName); } @TestMetadata("simplestClosure.kt") public void testSimplestClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt"); doTest(fileName); } @TestMetadata("simplestClosureAndBoxing.kt") public void testSimplestClosureAndBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt"); doTest(fileName); } @TestMetadata("subclosuresWithinInitializers.kt") public void testSubclosuresWithinInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/subclosuresWithinInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/subclosuresWithinInitializers.kt"); doTest(fileName); } @@ -1923,54 +1923,54 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class CaptureOuterProperty extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCaptureOuterProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("captureFunctionInProperty.kt") public void testCaptureFunctionInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt"); doTest(fileName); } @TestMetadata("inFunction.kt") public void testInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt"); doTest(fileName); } @TestMetadata("inProperty.kt") public void testInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt"); doTest(fileName); } @TestMetadata("inPropertyDeepObjectChain.kt") public void testInPropertyDeepObjectChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt"); doTest(fileName); } @TestMetadata("inPropertyFromSuperClass.kt") public void testInPropertyFromSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt"); doTest(fileName); } @TestMetadata("inPropertyFromSuperSuperClass.kt") public void testInPropertyFromSuperSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt"); doTest(fileName); } @TestMetadata("kt4176.kt") public void testKt4176() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt"); doTest(fileName); } @TestMetadata("kt4656.kt") public void testKt4656() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt"); doTest(fileName); } } @@ -1980,42 +1980,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClosureInsideClosure extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosureInsideClosure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localFunInsideLocalFun.kt") public void testLocalFunInsideLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt"); doTest(fileName); } @TestMetadata("localFunInsideLocalFunDifferentSignatures.kt") public void testLocalFunInsideLocalFunDifferentSignatures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt"); doTest(fileName); } @TestMetadata("propertyAndFunctionNameClash.kt") public void testPropertyAndFunctionNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt"); doTest(fileName); } @TestMetadata("threeLevels.kt") public void testThreeLevels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt"); doTest(fileName); } @TestMetadata("threeLevelsDifferentSignatures.kt") public void testThreeLevelsDifferentSignatures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt"); doTest(fileName); } @TestMetadata("varAsFunInsideLocalFun.kt") public void testVarAsFunInsideLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt"); doTest(fileName); } } @@ -2026,36 +2026,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constants extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstants() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/constants"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/constants"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constantsInWhen.kt") public void testConstantsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/constantsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/constantsInWhen.kt"); doTest(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/float.kt"); doTest(fileName); } @TestMetadata("kt9532.kt") public void testKt9532() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/kt9532.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/kt9532.kt"); doTest(fileName); } @TestMetadata("long.kt") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/long.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/long.kt"); doTest(fileName); } @TestMetadata("privateConst.kt") public void testPrivateConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/privateConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/privateConst.kt"); doTest(fileName); } } @@ -2065,336 +2065,336 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bottles.kt") public void testBottles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/bottles.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/bottles.kt"); doTest(fileName); } @TestMetadata("compareBoxedIntegerToZero.kt") public void testCompareBoxedIntegerToZero() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt"); doTest(fileName); } @TestMetadata("conditionOfEmptyIf.kt") public void testConditionOfEmptyIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt"); doTest(fileName); } @TestMetadata("continueInFor.kt") public void testContinueInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInFor.kt"); doTest(fileName); } @TestMetadata("continueInForCondition.kt") public void testContinueInForCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt"); doTest(fileName); } @TestMetadata("continueToLabelInFor.kt") public void testContinueToLabelInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhile.kt"); doTest(fileName); } @TestMetadata("doWhileFib.kt") public void testDoWhileFib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileFib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileFib.kt"); doTest(fileName); } @TestMetadata("doWhileWithContinue.kt") public void testDoWhileWithContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileWithContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileWithContinue.kt"); doTest(fileName); } @TestMetadata("emptyDoWhile.kt") public void testEmptyDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyDoWhile.kt"); doTest(fileName); } @TestMetadata("emptyFor.kt") public void testEmptyFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyFor.kt"); doTest(fileName); } @TestMetadata("emptyWhile.kt") public void testEmptyWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyWhile.kt"); doTest(fileName); } @TestMetadata("finallyOnEmptyReturn.kt") public void testFinallyOnEmptyReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt"); doTest(fileName); } @TestMetadata("forInSmartCastToArray.kt") public void testForInSmartCastToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forInSmartCastToArray.kt"); doTest(fileName); } @TestMetadata("forIntArray.kt") public void testForIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forIntArray.kt"); doTest(fileName); } @TestMetadata("forLoopMemberExtensionAll.kt") public void testForLoopMemberExtensionAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt"); doTest(fileName); } @TestMetadata("forLoopMemberExtensionHasNext.kt") public void testForLoopMemberExtensionHasNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt"); doTest(fileName); } @TestMetadata("forLoopMemberExtensionNext.kt") public void testForLoopMemberExtensionNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt"); doTest(fileName); } @TestMetadata("forNullableIntArray.kt") public void testForNullableIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt"); doTest(fileName); } @TestMetadata("forPrimitiveIntArray.kt") public void testForPrimitiveIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt"); doTest(fileName); } @TestMetadata("forUserType.kt") public void testForUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forUserType.kt"); doTest(fileName); } @TestMetadata("inRangeConditionsInWhen.kt") public void testInRangeConditionsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt"); doTest(fileName); } @TestMetadata("kt1441.kt") public void testKt1441() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1441.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1441.kt"); doTest(fileName); } @TestMetadata("kt1688.kt") public void testKt1688() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1688.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1688.kt"); doTest(fileName); } @TestMetadata("kt1742.kt") public void testKt1742() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1742.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1742.kt"); doTest(fileName); } @TestMetadata("kt1899.kt") public void testKt1899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1899.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1899.kt"); doTest(fileName); } @TestMetadata("kt2147.kt") public void testKt2147() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2147.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2147.kt"); doTest(fileName); } @TestMetadata("kt2259.kt") public void testKt2259() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2259.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2259.kt"); doTest(fileName); } @TestMetadata("kt2291.kt") public void testKt2291() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2291.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2291.kt"); doTest(fileName); } @TestMetadata("kt237.kt") public void testKt237() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt237.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt237.kt"); doTest(fileName); } @TestMetadata("kt2416.kt") public void testKt2416() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2416.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2416.kt"); doTest(fileName); } @TestMetadata("kt2577.kt") public void testKt2577() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2577.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2577.kt"); doTest(fileName); } @TestMetadata("kt2597.kt") public void testKt2597() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2597.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2597.kt"); doTest(fileName); } @TestMetadata("kt299.kt") public void testKt299() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt299.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt299.kt"); doTest(fileName); } @TestMetadata("kt3087.kt") public void testKt3087() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3087.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3087.kt"); doTest(fileName); } @TestMetadata("kt3203_1.kt") public void testKt3203_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_1.kt"); doTest(fileName); } @TestMetadata("kt3203_2.kt") public void testKt3203_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_2.kt"); doTest(fileName); } @TestMetadata("kt3273.kt") public void testKt3273() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3273.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3273.kt"); doTest(fileName); } @TestMetadata("kt3280.kt") public void testKt3280() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3280.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3280.kt"); doTest(fileName); } @TestMetadata("kt3574.kt") public void testKt3574() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3574.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3574.kt"); doTest(fileName); } @TestMetadata("kt416.kt") public void testKt416() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt416.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt416.kt"); doTest(fileName); } @TestMetadata("kt513.kt") public void testKt513() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt513.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt513.kt"); doTest(fileName); } @TestMetadata("kt628.kt") public void testKt628() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt628.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt628.kt"); doTest(fileName); } @TestMetadata("kt769.kt") public void testKt769() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt769.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt769.kt"); doTest(fileName); } @TestMetadata("kt772.kt") public void testKt772() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt772.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt772.kt"); doTest(fileName); } @TestMetadata("kt773.kt") public void testKt773() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt773.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt773.kt"); doTest(fileName); } @TestMetadata("kt8148.kt") public void testKt8148() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148.kt"); doTest(fileName); } @TestMetadata("kt8148_break.kt") public void testKt8148_break() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148_break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148_break.kt"); doTest(fileName); } @TestMetadata("kt8148_continue.kt") public void testKt8148_continue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148_continue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt8148_continue.kt"); doTest(fileName); } @TestMetadata("kt870.kt") public void testKt870() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt870.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt870.kt"); doTest(fileName); } @TestMetadata("kt910.kt") public void testKt910() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt910.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt910.kt"); doTest(fileName); } @TestMetadata("kt958.kt") public void testKt958() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt958.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt958.kt"); doTest(fileName); } @TestMetadata("longRange.kt") public void testLongRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/longRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/longRange.kt"); doTest(fileName); } @TestMetadata("quicksort.kt") public void testQuicksort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/quicksort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/quicksort.kt"); doTest(fileName); } @TestMetadata("tryCatchFinallyChain.kt") public void testTryCatchFinallyChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt"); doTest(fileName); } @@ -2403,60 +2403,60 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class BreakContinueInExpressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBreakContinueInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("breakFromOuter.kt") public void testBreakFromOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakFromOuter.kt"); doTest(fileName); } @TestMetadata("breakInExpr.kt") public void testBreakInExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakInExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/breakInExpr.kt"); doTest(fileName); } @TestMetadata("continueInExpr.kt") public void testContinueInExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/continueInExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/continueInExpr.kt"); doTest(fileName); } @TestMetadata("inlineWithStack.kt") public void testInlineWithStack() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlineWithStack.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/inlineWithStack.kt"); doTest(fileName); } @TestMetadata("innerLoopWithStack.kt") public void testInnerLoopWithStack() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/innerLoopWithStack.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/innerLoopWithStack.kt"); doTest(fileName); } @TestMetadata("popSizes.kt") public void testPopSizes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/popSizes.kt"); doTest(fileName); } @TestMetadata("tryFinally1.kt") public void testTryFinally1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally1.kt"); doTest(fileName); } @TestMetadata("tryFinally2.kt") public void testTryFinally2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/tryFinally2.kt"); doTest(fileName); } @TestMetadata("whileTrueBreak.kt") public void testWhileTrueBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/whileTrueBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/breakContinueInExpressions/whileTrueBreak.kt"); doTest(fileName); } } @@ -2466,138 +2466,138 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class TryCatchInExpressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTryCatchInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("catch.kt") public void testCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/catch.kt"); doTest(fileName); } @TestMetadata("complexChain.kt") public void testComplexChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/complexChain.kt"); doTest(fileName); } @TestMetadata("deadTryCatch.kt") public void testDeadTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/deadTryCatch.kt"); doTest(fileName); } @TestMetadata("differentTypes.kt") public void testDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/differentTypes.kt"); doTest(fileName); } @TestMetadata("expectException.kt") public void testExpectException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/expectException.kt"); doTest(fileName); } @TestMetadata("finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/finally.kt"); doTest(fileName); } @TestMetadata("inlineTryCatch.kt") public void testInlineTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryCatch.kt"); doTest(fileName); } @TestMetadata("inlineTryExpr.kt") public void testInlineTryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryExpr.kt"); doTest(fileName); } @TestMetadata("inlineTryFinally.kt") public void testInlineTryFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/inlineTryFinally.kt"); doTest(fileName); } @TestMetadata("kt8608.kt") public void testKt8608() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt8608.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt8608.kt"); doTest(fileName); } @TestMetadata("kt9644try.kt") public void testKt9644try() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/kt9644try.kt"); doTest(fileName); } @TestMetadata("multipleCatchBlocks.kt") public void testMultipleCatchBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/multipleCatchBlocks.kt"); doTest(fileName); } @TestMetadata("splitTry.kt") public void testSplitTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTry.kt"); doTest(fileName); } @TestMetadata("splitTryCorner1.kt") public void testSplitTryCorner1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner1.kt"); doTest(fileName); } @TestMetadata("splitTryCorner2.kt") public void testSplitTryCorner2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/splitTryCorner2.kt"); doTest(fileName); } @TestMetadata("try.kt") public void testTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/try.kt"); doTest(fileName); } @TestMetadata("tryAfterTry.kt") public void testTryAfterTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAfterTry.kt"); doTest(fileName); } @TestMetadata("tryAndBreak.kt") public void testTryAndBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndBreak.kt"); doTest(fileName); } @TestMetadata("tryAndContinue.kt") public void testTryAndContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryAndContinue.kt"); doTest(fileName); } @TestMetadata("tryInsideCatch.kt") public void testTryInsideCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideCatch.kt"); doTest(fileName); } @TestMetadata("tryInsideTry.kt") public void testTryInsideTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/tryInsideTry.kt"); doTest(fileName); } @TestMetadata("unmatchedInlineMarkers.kt") public void testUnmatchedInlineMarkers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchInExpressions/unmatchedInlineMarkers.kt"); doTest(fileName); } } @@ -2608,18 +2608,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeadCodeElimination extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDeadCodeElimination() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("intersectingVariableRange.kt") public void testIntersectingVariableRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/deadCodeElimination/intersectingVariableRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/deadCodeElimination/intersectingVariableRange.kt"); doTest(fileName); } @TestMetadata("intersectingVariableRangeInFinally.kt") public void testIntersectingVariableRangeInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/deadCodeElimination/intersectingVariableRangeInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/deadCodeElimination/intersectingVariableRangeInFinally.kt"); doTest(fileName); } } @@ -2629,7 +2629,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/defaultArguments/constructor") @@ -2637,72 +2637,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/annotation.kt"); doTest(fileName); } @TestMetadata("defArgs1.kt") public void testDefArgs1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1.kt"); doTest(fileName); } @TestMetadata("defArgs1InnerClass.kt") public void testDefArgs1InnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1InnerClass.kt"); doTest(fileName); } @TestMetadata("defArgs2.kt") public void testDefArgs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs2.kt"); doTest(fileName); } @TestMetadata("doubleDefArgs1InnerClass.kt") public void testDoubleDefArgs1InnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/doubleDefArgs1InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/doubleDefArgs1InnerClass.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enum.kt"); doTest(fileName); } @TestMetadata("enumWithOneDefArg.kt") public void testEnumWithOneDefArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt"); doTest(fileName); } @TestMetadata("enumWithTwoDefArgs.kt") public void testEnumWithTwoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt"); doTest(fileName); } @TestMetadata("enumWithTwoDoubleDefArgs.kt") public void testEnumWithTwoDoubleDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt"); doTest(fileName); } @TestMetadata("kt2852.kt") public void testKt2852() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt"); doTest(fileName); } @TestMetadata("kt3060.kt") public void testKt3060() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt"); doTest(fileName); } } @@ -2713,143 +2713,143 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class Function extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClass.kt") public void testAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("augmentedAssignment.kt") public void testAugmentedAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignment.kt"); doTest(fileName); } @TestMetadata("augmentedAssignmentViaBinaryExpression.kt") public void testAugmentedAssignmentViaBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignmentViaBinaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignmentViaBinaryExpression.kt"); doTest(fileName); } @TestMetadata("binaryCall.kt") public void testBinaryCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryCall.kt"); doTest(fileName); } @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryExpression.kt"); doTest(fileName); } @TestMetadata("contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/contains.kt"); doTest(fileName); } @TestMetadata("extensionFunctionManyArgs.kt") public void testExtensionFunctionManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extensionFunctionManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extensionFunctionManyArgs.kt"); doTest(fileName); } @TestMetadata("extentionFunction.kt") public void testExtentionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunction.kt"); doTest(fileName); } @TestMetadata("extentionFunctionDouble.kt") public void testExtentionFunctionDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDouble.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDouble.kt"); doTest(fileName); } @TestMetadata("extentionFunctionDoubleTwoArgs.kt") public void testExtentionFunctionDoubleTwoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDoubleTwoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDoubleTwoArgs.kt"); doTest(fileName); } @TestMetadata("extentionFunctionInClassObject.kt") public void testExtentionFunctionInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt"); doTest(fileName); } @TestMetadata("extentionFunctionInObject.kt") public void testExtentionFunctionInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt"); doTest(fileName); } @TestMetadata("extentionFunctionWithOneDefArg.kt") public void testExtentionFunctionWithOneDefArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionWithOneDefArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionWithOneDefArg.kt"); doTest(fileName); } @TestMetadata("funInTrait.kt") public void testFunInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt"); doTest(fileName); } @TestMetadata("innerExtentionFunction.kt") public void testInnerExtentionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt"); doTest(fileName); } @TestMetadata("innerExtentionFunctionDouble.kt") public void testInnerExtentionFunctionDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt"); doTest(fileName); } @TestMetadata("innerExtentionFunctionDoubleTwoArgs.kt") public void testInnerExtentionFunctionDoubleTwoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt"); doTest(fileName); } @TestMetadata("innerExtentionFunctionManyArgs.kt") public void testInnerExtentionFunctionManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionManyArgs.kt"); doTest(fileName); } @TestMetadata("kt5232.kt") public void testKt5232() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/kt5232.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/kt5232.kt"); doTest(fileName); } @TestMetadata("memberFunctionManyArgs.kt") public void testMemberFunctionManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/memberFunctionManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/memberFunctionManyArgs.kt"); doTest(fileName); } @TestMetadata("mixingNamedAndPositioned.kt") public void testMixingNamedAndPositioned() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt"); doTest(fileName); } @TestMetadata("topLevelManyArgs.kt") public void testTopLevelManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/topLevelManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/topLevelManyArgs.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/trait.kt"); doTest(fileName); } } @@ -2859,30 +2859,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Private extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/private"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/private"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("memberExtensionFunction.kt") public void testMemberExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/memberExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/memberExtensionFunction.kt"); doTest(fileName); } @TestMetadata("memberFunction.kt") public void testMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/memberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/memberFunction.kt"); doTest(fileName); } @TestMetadata("primaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/primaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/primaryConstructor.kt"); doTest(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/private/secondaryConstructor.kt"); doTest(fileName); } } @@ -2894,185 +2894,185 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class DelegatedProperty extends AbstractBlackBoxCodegenTest { @TestMetadata("accessTopLevelDelegatedPropertyInClinit.kt") public void testAccessTopLevelDelegatedPropertyInClinit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt"); doTest(fileName); } public void testAllFilesPresentInDelegatedProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("capturePropertyInClosure.kt") public void testCapturePropertyInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt"); doTest(fileName); } @TestMetadata("castGetReturnType.kt") public void testCastGetReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt"); doTest(fileName); } @TestMetadata("castSetParameter.kt") public void testCastSetParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt"); doTest(fileName); } @TestMetadata("defaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt"); doTest(fileName); } @TestMetadata("delegateAsInnerClass.kt") public void testDelegateAsInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt"); doTest(fileName); } @TestMetadata("delegateByOtherProperty.kt") public void testDelegateByOtherProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt"); doTest(fileName); } @TestMetadata("delegateByTopLevelFun.kt") public void testDelegateByTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt"); doTest(fileName); } @TestMetadata("delegateByTopLevelProperty.kt") public void testDelegateByTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt"); doTest(fileName); } @TestMetadata("delegateForExtProperty.kt") public void testDelegateForExtProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt"); doTest(fileName); } @TestMetadata("delegateForExtPropertyInClass.kt") public void testDelegateForExtPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt"); doTest(fileName); } @TestMetadata("genericDelegate.kt") public void testGenericDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt"); doTest(fileName); } @TestMetadata("getAsExtensionFun.kt") public void testGetAsExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt"); doTest(fileName); } @TestMetadata("getAsExtensionFunInClass.kt") public void testGetAsExtensionFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt"); doTest(fileName); } @TestMetadata("inClassVal.kt") public void testInClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVal.kt"); doTest(fileName); } @TestMetadata("inClassVar.kt") public void testInClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVar.kt"); doTest(fileName); } @TestMetadata("inTrait.kt") public void testInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inTrait.kt"); doTest(fileName); } @TestMetadata("inferredPropertyType.kt") public void testInferredPropertyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt"); doTest(fileName); } @TestMetadata("kt4138.kt") public void testKt4138() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/kt4138.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/kt4138.kt"); doTest(fileName); } @TestMetadata("privateVar.kt") public void testPrivateVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/privateVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/privateVar.kt"); doTest(fileName); } @TestMetadata("propertyMetadataShouldBeCached.kt") public void testPropertyMetadataShouldBeCached() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt"); doTest(fileName); } @TestMetadata("setAsExtensionFun.kt") public void testSetAsExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt"); doTest(fileName); } @TestMetadata("setAsExtensionFunInClass.kt") public void testSetAsExtensionFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt"); doTest(fileName); } @TestMetadata("topLevelVal.kt") public void testTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt"); doTest(fileName); } @TestMetadata("topLevelVar.kt") public void testTopLevelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt"); doTest(fileName); } @TestMetadata("twoPropByOneDelegete.kt") public void testTwoPropByOneDelegete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt"); doTest(fileName); } @TestMetadata("useReflectionOnKProperty.kt") public void testUseReflectionOnKProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/useReflectionOnKProperty.kt"); doTest(fileName); } @TestMetadata("valInInnerClass.kt") public void testValInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt"); doTest(fileName); } @TestMetadata("varInInnerClass.kt") public void testVarInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/vararg.kt"); doTest(fileName); } } @@ -3082,7 +3082,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Diagnostics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDiagnostics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @@ -3090,7 +3090,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/inference") @@ -3098,12 +3098,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Inference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/inference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/inference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt6176.kt") public void testKt6176() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.kt"); doTest(fileName); } } @@ -3113,7 +3113,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects") @@ -3121,66 +3121,66 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class OnObjects extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOnObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("invokeOnClassObject1.kt") public void testInvokeOnClassObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObject2.kt") public void testInvokeOnClassObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObjectOfNestedClass1.kt") public void testInvokeOnClassObjectOfNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObjectOfNestedClass2.kt") public void testInvokeOnClassObjectOfNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt"); doTest(fileName); } @TestMetadata("invokeOnEnum1.kt") public void testInvokeOnEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.kt"); doTest(fileName); } @TestMetadata("invokeOnEnum2.kt") public void testInvokeOnEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.kt"); doTest(fileName); } @TestMetadata("invokeOnImportedEnum1.kt") public void testInvokeOnImportedEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.kt"); doTest(fileName); } @TestMetadata("invokeOnImportedEnum2.kt") public void testInvokeOnImportedEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.kt"); doTest(fileName); } @TestMetadata("invokeOnObject1.kt") public void testInvokeOnObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnObject2.kt") public void testInvokeOnObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.kt"); doTest(fileName); } } @@ -3191,222 +3191,222 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class TailRecursion extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTailRecursion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.kt"); doTest(fileName); } @TestMetadata("extensionTailCall.kt") public void testExtensionTailCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.kt"); doTest(fileName); } @TestMetadata("functionWithNoTails.kt") public void testFunctionWithNoTails() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.kt"); doTest(fileName); } @TestMetadata("functionWithNonTailRecursions.kt") public void testFunctionWithNonTailRecursions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.kt"); doTest(fileName); } @TestMetadata("functionWithoutAnnotation.kt") public void testFunctionWithoutAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.kt"); doTest(fileName); } @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.kt"); doTest(fileName); } @TestMetadata("insideElvis.kt") public void testInsideElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.kt"); doTest(fileName); } @TestMetadata("labeledThisReferences.kt") public void testLabeledThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.kt"); doTest(fileName); } @TestMetadata("loops.kt") public void testLoops() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.kt"); doTest(fileName); } @TestMetadata("multilevelBlocks.kt") public void testMultilevelBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.kt"); doTest(fileName); } @TestMetadata("realIteratorFoldl.kt") public void testRealIteratorFoldl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.kt"); doTest(fileName); } @TestMetadata("realStringEscape.kt") public void testRealStringEscape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.kt"); doTest(fileName); } @TestMetadata("realStringRepeat.kt") public void testRealStringRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.kt"); doTest(fileName); } @TestMetadata("recursiveCallInLambda.kt") public void testRecursiveCallInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.kt"); doTest(fileName); } @TestMetadata("recursiveCallInLocalFunction.kt") public void testRecursiveCallInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.kt"); doTest(fileName); } @TestMetadata("recursiveInnerFunction.kt") public void testRecursiveInnerFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.kt"); doTest(fileName); } @TestMetadata("returnIf.kt") public void testReturnIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.kt"); doTest(fileName); } @TestMetadata("returnInCatch.kt") public void testReturnInCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.kt"); doTest(fileName); } @TestMetadata("returnInFinally.kt") public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.kt"); doTest(fileName); } @TestMetadata("returnInIfInFinally.kt") public void testReturnInIfInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.kt"); doTest(fileName); } @TestMetadata("returnInParentheses.kt") public void testReturnInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.kt"); doTest(fileName); } @TestMetadata("returnInTry.kt") public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.kt"); doTest(fileName); } @TestMetadata("simpleBlock.kt") public void testSimpleBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.kt"); doTest(fileName); } @TestMetadata("simpleReturn.kt") public void testSimpleReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.kt"); doTest(fileName); } @TestMetadata("simpleReturnWithElse.kt") public void testSimpleReturnWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.kt"); doTest(fileName); } @TestMetadata("sum.kt") public void testSum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.kt"); doTest(fileName); } @TestMetadata("tailCallInBlockInParentheses.kt") public void testTailCallInBlockInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.kt"); doTest(fileName); } @TestMetadata("tailCallInParentheses.kt") public void testTailCallInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.kt"); doTest(fileName); } @TestMetadata("tailRecursionInFinally.kt") public void testTailRecursionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.kt"); doTest(fileName); } @TestMetadata("thisReferences.kt") public void testThisReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.kt"); doTest(fileName); } @TestMetadata("unitBlocks.kt") public void testUnitBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.kt"); doTest(fileName); } @TestMetadata("whenWithCondition.kt") public void testWhenWithCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.kt"); doTest(fileName); } @TestMetadata("whenWithInRange.kt") public void testWhenWithInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.kt"); doTest(fileName); } @TestMetadata("whenWithIs.kt") public void testWhenWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.kt"); doTest(fileName); } @TestMetadata("whenWithoutCondition.kt") public void testWhenWithoutCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.kt"); doTest(fileName); } } @@ -3417,12 +3417,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/diagnostics/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt4172.kt") public void testKt4172() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/diagnostics/vararg/kt4172.kt"); doTest(fileName); } } @@ -3433,24 +3433,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Elvis extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInElvis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") public void testGenericNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/genericNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/genericNull.kt"); doTest(fileName); } @TestMetadata("kt6694ExactAnnotationForElvis.kt") public void testKt6694ExactAnnotationForElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/kt6694ExactAnnotationForElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/kt6694ExactAnnotationForElvis.kt"); doTest(fileName); } @TestMetadata("primitive.kt") public void testPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/primitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/primitive.kt"); doTest(fileName); } } @@ -3461,167 +3461,167 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class Enum extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractMethodInEnum.kt") public void testAbstractMethodInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractMethodInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractMethodInEnum.kt"); doTest(fileName); } @TestMetadata("abstractNestedClass.kt") public void testAbstractNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractNestedClass.kt"); doTest(fileName); } public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("asReturnExpression.kt") public void testAsReturnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/asReturnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/asReturnExpression.kt"); doTest(fileName); } @TestMetadata("companionObjectInEnum.kt") public void testCompanionObjectInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/companionObjectInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/companionObjectInEnum.kt"); doTest(fileName); } @TestMetadata("emptyConstructor.kt") public void testEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/emptyConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/emptyConstructor.kt"); doTest(fileName); } @TestMetadata("emptyEnumValuesValueOf.kt") public void testEmptyEnumValuesValueOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt"); doTest(fileName); } @TestMetadata("entrywithinner.kt") public void testEntrywithinner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/entrywithinner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/entrywithinner.kt"); doTest(fileName); } @TestMetadata("enumInheritedFromTrait.kt") public void testEnumInheritedFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumInheritedFromTrait.kt"); doTest(fileName); } @TestMetadata("enumShort.kt") public void testEnumShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumShort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumShort.kt"); doTest(fileName); } @TestMetadata("enumWithLambdaParameter.kt") public void testEnumWithLambdaParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/enumWithLambdaParameter.kt"); doTest(fileName); } @TestMetadata("inPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inPackage.kt"); doTest(fileName); } @TestMetadata("inclassobj.kt") public void testInclassobj() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inclassobj.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inclassobj.kt"); doTest(fileName); } @TestMetadata("inner.kt") public void testInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inner.kt"); doTest(fileName); } @TestMetadata("innerWithExistingClassObject.kt") public void testInnerWithExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt"); doTest(fileName); } @TestMetadata("kt1119.kt") public void testKt1119() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt1119.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt1119.kt"); doTest(fileName); } @TestMetadata("kt2350.kt") public void testKt2350() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt2350.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt2350.kt"); doTest(fileName); } @TestMetadata("kt9711.kt") public void testKt9711() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt9711.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt9711.kt"); doTest(fileName); } @TestMetadata("kt9711_2.kt") public void testKt9711_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt9711_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt9711_2.kt"); doTest(fileName); } @TestMetadata("name.kt") public void testName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/name.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/name.kt"); doTest(fileName); } @TestMetadata("objectInEnum.kt") public void testObjectInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/objectInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/objectInEnum.kt"); doTest(fileName); } @TestMetadata("openMethod.kt") public void testOpenMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/openMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/openMethod.kt"); doTest(fileName); } @TestMetadata("ordinal.kt") public void testOrdinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/ordinal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/ordinal.kt"); doTest(fileName); } @TestMetadata("publicConstructorWithDefault.kt") public void testPublicConstructorWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/publicConstructorWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/publicConstructorWithDefault.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/simple.kt"); doTest(fileName); } @TestMetadata("superCallInEnumLiteral.kt") public void testSuperCallInEnumLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/superCallInEnumLiteral.kt"); doTest(fileName); } @TestMetadata("toString.kt") public void testToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/toString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/toString.kt"); doTest(fileName); } @TestMetadata("valueof.kt") public void testValueof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/valueof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/valueof.kt"); doTest(fileName); } } @@ -3631,18 +3631,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExclExcl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExclExcl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") public void testGenericNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/genericNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/genericNull.kt"); doTest(fileName); } @TestMetadata("primitive.kt") public void testPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/primitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/primitive.kt"); doTest(fileName); } } @@ -3652,138 +3652,138 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExtensionFunctions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExtensionFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("executionOrder.kt") public void testExecutionOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/executionOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/executionOrder.kt"); doTest(fileName); } @TestMetadata("kt1061.kt") public void testKt1061() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1061.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1061.kt"); doTest(fileName); } @TestMetadata("kt1249.kt") public void testKt1249() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1249.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1249.kt"); doTest(fileName); } @TestMetadata("kt1290.kt") public void testKt1290() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1290.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1290.kt"); doTest(fileName); } @TestMetadata("kt1776.kt") public void testKt1776() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1776.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1776.kt"); doTest(fileName); } @TestMetadata("kt1953.kt") public void testKt1953() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953.kt"); doTest(fileName); } @TestMetadata("kt1953_class.kt") public void testKt1953_class() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt"); doTest(fileName); } @TestMetadata("kt3285.kt") public void testKt3285() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3285.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3285.kt"); doTest(fileName); } @TestMetadata("kt3298.kt") public void testKt3298() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3298.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3298.kt"); doTest(fileName); } @TestMetadata("kt3646.kt") public void testKt3646() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3646.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3646.kt"); doTest(fileName); } @TestMetadata("kt3969.kt") public void testKt3969() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3969.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3969.kt"); doTest(fileName); } @TestMetadata("kt4228.kt") public void testKt4228() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt4228.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt4228.kt"); doTest(fileName); } @TestMetadata("kt475.kt") public void testKt475() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt475.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt475.kt"); doTest(fileName); } @TestMetadata("kt5467.kt") public void testKt5467() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt5467.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt5467.kt"); doTest(fileName); } @TestMetadata("kt606.kt") public void testKt606() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt606.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt606.kt"); doTest(fileName); } @TestMetadata("kt865.kt") public void testKt865() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt865.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt865.kt"); doTest(fileName); } @TestMetadata("nested2.kt") public void testNested2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/nested2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/nested2.kt"); doTest(fileName); } @TestMetadata("shared.kt") public void testShared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/shared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/shared.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/simple.kt"); doTest(fileName); } @TestMetadata("thisMethodInObjectLiteral.kt") public void testThisMethodInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt"); doTest(fileName); } @TestMetadata("virtual.kt") public void testVirtual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/virtual.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/virtual.kt"); doTest(fileName); } @TestMetadata("whenFail.kt") public void testWhenFail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/whenFail.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/whenFail.kt"); doTest(fileName); } } @@ -3794,77 +3794,77 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class ExtensionProperties extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorForPrivateSetter.kt") public void testAccessorForPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/accessorForPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/accessorForPrivateSetter.kt"); doTest(fileName); } public void testAllFilesPresentInExtensionProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionProperties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionProperties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericValForPrimitiveType.kt") public void testGenericValForPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericValForPrimitiveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericValForPrimitiveType.kt"); doTest(fileName); } @TestMetadata("genericValMultipleUpperBounds.kt") public void testGenericValMultipleUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericValMultipleUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericValMultipleUpperBounds.kt"); doTest(fileName); } @TestMetadata("genericVarForPrimitiveType.kt") public void testGenericVarForPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericVarForPrimitiveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/genericVarForPrimitiveType.kt"); doTest(fileName); } @TestMetadata("inClass.kt") public void testInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClass.kt"); doTest(fileName); } @TestMetadata("inClassLongTypeInReceiver.kt") public void testInClassLongTypeInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassLongTypeInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassLongTypeInReceiver.kt"); doTest(fileName); } @TestMetadata("inClassWithGetter.kt") public void testInClassWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt"); doTest(fileName); } @TestMetadata("inClassWithPrivateGetter.kt") public void testInClassWithPrivateGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt"); doTest(fileName); } @TestMetadata("inClassWithPrivateSetter.kt") public void testInClassWithPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateSetter.kt"); doTest(fileName); } @TestMetadata("inClassWithSetter.kt") public void testInClassWithSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithSetter.kt"); doTest(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevel.kt"); doTest(fileName); } @TestMetadata("topLevelLongTypeInReceiver.kt") public void testTopLevelLongTypeInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevelLongTypeInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevelLongTypeInReceiver.kt"); doTest(fileName); } } @@ -3874,30 +3874,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class FakeOverride extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFakeOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fakeOverride"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fakeOverride"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("diamondFunction.kt") public void testDiamondFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/diamondFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/diamondFunction.kt"); doTest(fileName); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/function.kt"); doTest(fileName); } @TestMetadata("propertyGetter.kt") public void testPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertyGetter.kt"); doTest(fileName); } @TestMetadata("propertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertySetter.kt"); doTest(fileName); } } @@ -3907,24 +3907,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class FieldRename extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFieldRename() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorAndClassObject.kt") public void testConstructorAndClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt"); doTest(fileName); } @TestMetadata("delegates.kt") public void testDelegates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/delegates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/delegates.kt"); doTest(fileName); } @TestMetadata("genericPropertyWithItself.kt") public void testGenericPropertyWithItself() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt"); doTest(fileName); } } @@ -3934,72 +3934,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Finally extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/finally"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/finally"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finallyAndFinally.kt") public void testFinallyAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/finallyAndFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/finallyAndFinally.kt"); doTest(fileName); } @TestMetadata("kt3549.kt") public void testKt3549() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3549.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3549.kt"); doTest(fileName); } @TestMetadata("kt3706.kt") public void testKt3706() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3706.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3706.kt"); doTest(fileName); } @TestMetadata("kt3867.kt") public void testKt3867() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3867.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3867.kt"); doTest(fileName); } @TestMetadata("kt3874.kt") public void testKt3874() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3874.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3874.kt"); doTest(fileName); } @TestMetadata("kt3894.kt") public void testKt3894() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3894.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3894.kt"); doTest(fileName); } @TestMetadata("kt4134.kt") public void testKt4134() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt4134.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt4134.kt"); doTest(fileName); } @TestMetadata("loopAndFinally.kt") public void testLoopAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/loopAndFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/loopAndFinally.kt"); doTest(fileName); } @TestMetadata("notChainCatch.kt") public void testNotChainCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/notChainCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/notChainCatch.kt"); doTest(fileName); } @TestMetadata("tryFinally.kt") public void testTryFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryFinally.kt"); doTest(fileName); } @TestMetadata("tryLoopTry.kt") public void testTryLoopTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryLoopTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryLoopTry.kt"); doTest(fileName); } } @@ -4009,246 +4009,246 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("coerceVoidToArray.kt") public void testCoerceVoidToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToArray.kt"); doTest(fileName); } @TestMetadata("coerceVoidToObject.kt") public void testCoerceVoidToObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToObject.kt"); doTest(fileName); } @TestMetadata("defaultargs.kt") public void testDefaultargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs.kt"); doTest(fileName); } @TestMetadata("defaultargs1.kt") public void testDefaultargs1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs1.kt"); doTest(fileName); } @TestMetadata("defaultargs2.kt") public void testDefaultargs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs2.kt"); doTest(fileName); } @TestMetadata("defaultargs3.kt") public void testDefaultargs3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs3.kt"); doTest(fileName); } @TestMetadata("defaultargs4.kt") public void testDefaultargs4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs4.kt"); doTest(fileName); } @TestMetadata("defaultargs5.kt") public void testDefaultargs5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs5.kt"); doTest(fileName); } @TestMetadata("defaultargs6.kt") public void testDefaultargs6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs6.kt"); doTest(fileName); } @TestMetadata("defaultargs7.kt") public void testDefaultargs7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs7.kt"); doTest(fileName); } @TestMetadata("ea33909.kt") public void testEa33909() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/ea33909.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/ea33909.kt"); doTest(fileName); } @TestMetadata("fakeDescriptorWithSeveralOverridenOne.kt") public void testFakeDescriptorWithSeveralOverridenOne() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt"); doTest(fileName); } @TestMetadata("functionNtoString.kt") public void testFunctionNtoString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionNtoString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionNtoString.kt"); doTest(fileName); } @TestMetadata("infixRecursiveCall.kt") public void testInfixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/infixRecursiveCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/infixRecursiveCall.kt"); doTest(fileName); } @TestMetadata("kt1038.kt") public void testKt1038() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1038.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1038.kt"); doTest(fileName); } @TestMetadata("kt1199.kt") public void testKt1199() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1199.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1199.kt"); doTest(fileName); } @TestMetadata("kt1413.kt") public void testKt1413() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1413.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1413.kt"); doTest(fileName); } @TestMetadata("kt1649_1.kt") public void testKt1649_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_1.kt"); doTest(fileName); } @TestMetadata("kt1649_2.kt") public void testKt1649_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_2.kt"); doTest(fileName); } @TestMetadata("kt1739.kt") public void testKt1739() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1739.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1739.kt"); doTest(fileName); } @TestMetadata("kt2270.kt") public void testKt2270() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2270.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2270.kt"); doTest(fileName); } @TestMetadata("kt2271.kt") public void testKt2271() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2271.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2271.kt"); doTest(fileName); } @TestMetadata("kt2280.kt") public void testKt2280() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2280.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2280.kt"); doTest(fileName); } @TestMetadata("kt2481.kt") public void testKt2481() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2481.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2481.kt"); doTest(fileName); } @TestMetadata("kt2716.kt") public void testKt2716() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2716.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2716.kt"); doTest(fileName); } @TestMetadata("kt2739.kt") public void testKt2739() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2739.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2739.kt"); doTest(fileName); } @TestMetadata("kt2929.kt") public void testKt2929() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2929.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2929.kt"); doTest(fileName); } @TestMetadata("kt3214.kt") public void testKt3214() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3214.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3214.kt"); doTest(fileName); } @TestMetadata("kt3313.kt") public void testKt3313() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3313.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3313.kt"); doTest(fileName); } @TestMetadata("kt3573.kt") public void testKt3573() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3573.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3573.kt"); doTest(fileName); } @TestMetadata("kt3724.kt") public void testKt3724() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3724.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3724.kt"); doTest(fileName); } @TestMetadata("kt395.kt") public void testKt395() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt395.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt395.kt"); doTest(fileName); } @TestMetadata("kt785.kt") public void testKt785() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt785.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt785.kt"); doTest(fileName); } @TestMetadata("kt873.kt") public void testKt873() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt873.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt873.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunction.kt"); doTest(fileName); } @TestMetadata("localReturnInsideFunctionExpression.kt") public void testLocalReturnInsideFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localReturnInsideFunctionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localReturnInsideFunctionExpression.kt"); doTest(fileName); } @TestMetadata("nothisnoclosure.kt") public void testNothisnoclosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/nothisnoclosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/nothisnoclosure.kt"); doTest(fileName); } @TestMetadata("prefixRecursiveCall.kt") public void testPrefixRecursiveCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt"); doTest(fileName); } @TestMetadata("recursiveCompareTo.kt") public void testRecursiveCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveCompareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveCompareTo.kt"); doTest(fileName); } @TestMetadata("recursiveIncrementCall.kt") public void testRecursiveIncrementCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt"); doTest(fileName); } @@ -4257,24 +4257,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionExpression extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctionExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/functionExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/functionExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionExpression.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt"); doTest(fileName); } @TestMetadata("functionExpressionWithThisReference.kt") public void testFunctionExpressionWithThisReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt"); doTest(fileName); } @TestMetadata("functionLiteralExpression.kt") public void testFunctionLiteralExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionLiteralExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionLiteralExpression.kt"); doTest(fileName); } } @@ -4284,78 +4284,78 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("castFunctionToExtension.kt") public void testCastFunctionToExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/castFunctionToExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/castFunctionToExtension.kt"); doTest(fileName); } @TestMetadata("extensionInvokeOnExpr.kt") public void testExtensionInvokeOnExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invoke.kt"); doTest(fileName); } @TestMetadata("invokeOnExprByConvention.kt") public void testInvokeOnExprByConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt"); doTest(fileName); } @TestMetadata("kt3189.kt") public void testKt3189() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3189.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3189.kt"); doTest(fileName); } @TestMetadata("kt3190.kt") public void testKt3190() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3190.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3190.kt"); doTest(fileName); } @TestMetadata("kt3297.kt") public void testKt3297() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3297.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3297.kt"); doTest(fileName); } @TestMetadata("kt3450getAndInvoke.kt") public void testKt3450getAndInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3450getAndInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3450getAndInvoke.kt"); doTest(fileName); } @TestMetadata("kt3631invokeOnString.kt") public void testKt3631invokeOnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3631invokeOnString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3631invokeOnString.kt"); doTest(fileName); } @TestMetadata("kt3772.kt") public void testKt3772() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3772.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3772.kt"); doTest(fileName); } @TestMetadata("kt3821invokeOnThis.kt") public void testKt3821invokeOnThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt"); doTest(fileName); } @TestMetadata("kt3822invokeOnThis.kt") public void testKt3822invokeOnThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt"); doTest(fileName); } } @@ -4365,84 +4365,84 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class LocalFunctions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2895.kt") public void testKt2895() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt2895.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt2895.kt"); doTest(fileName); } @TestMetadata("kt3308.kt") public void testKt3308() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3308.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3308.kt"); doTest(fileName); } @TestMetadata("kt3978.kt") public void testKt3978() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3978.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3978.kt"); doTest(fileName); } @TestMetadata("kt4119.kt") public void testKt4119() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119.kt"); doTest(fileName); } @TestMetadata("kt4119_2.kt") public void testKt4119_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119_2.kt"); doTest(fileName); } @TestMetadata("kt4514.kt") public void testKt4514() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt"); doTest(fileName); } @TestMetadata("kt4777.kt") public void testKt4777() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt"); doTest(fileName); } @TestMetadata("kt4783.kt") public void testKt4783() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt"); doTest(fileName); } @TestMetadata("kt4784.kt") public void testKt4784() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4784.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4784.kt"); doTest(fileName); } @TestMetadata("kt4989.kt") public void testKt4989() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4989.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4989.kt"); doTest(fileName); } @TestMetadata("localExtensionOnNullableParameter.kt") public void testLocalExtensionOnNullableParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt"); doTest(fileName); } @TestMetadata("localFunctionInConstructor.kt") public void testLocalFunctionInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt"); doTest(fileName); } @TestMetadata("localWithDefault.kt") public void testLocalWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localWithDefault.kt"); doTest(fileName); } } @@ -4453,96 +4453,96 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Increment extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInIncrement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/increment"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/increment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignPlusOnSmartCast.kt") public void testAssignPlusOnSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/assignPlusOnSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/assignPlusOnSmartCast.kt"); doTest(fileName); } @TestMetadata("postfixIncrementDoubleSmartCast.kt") public void testPostfixIncrementDoubleSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementDoubleSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementDoubleSmartCast.kt"); doTest(fileName); } @TestMetadata("postfixIncrementOnClass.kt") public void testPostfixIncrementOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnClass.kt"); doTest(fileName); } @TestMetadata("postfixIncrementOnClassSmartCast.kt") public void testPostfixIncrementOnClassSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnClassSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnClassSmartCast.kt"); doTest(fileName); } @TestMetadata("postfixIncrementOnShortSmartCast.kt") public void testPostfixIncrementOnShortSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnShortSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnShortSmartCast.kt"); doTest(fileName); } @TestMetadata("postfixIncrementOnSmartCast.kt") public void testPostfixIncrementOnSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixIncrementOnSmartCast.kt"); doTest(fileName); } @TestMetadata("postfixNotnullClassIncrement.kt") public void testPostfixNotnullClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNotnullClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNotnullClassIncrement.kt"); doTest(fileName); } @TestMetadata("postfixNullableClassIncrement.kt") public void testPostfixNullableClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNullableClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNullableClassIncrement.kt"); doTest(fileName); } @TestMetadata("postfixNullableIncrement.kt") public void testPostfixNullableIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNullableIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/postfixNullableIncrement.kt"); doTest(fileName); } @TestMetadata("prefixIncrementOnClass.kt") public void testPrefixIncrementOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnClass.kt"); doTest(fileName); } @TestMetadata("prefixIncrementOnClassSmartCast.kt") public void testPrefixIncrementOnClassSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnClassSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnClassSmartCast.kt"); doTest(fileName); } @TestMetadata("prefixIncrementOnSmartCast.kt") public void testPrefixIncrementOnSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixIncrementOnSmartCast.kt"); doTest(fileName); } @TestMetadata("prefixNotnullClassIncrement.kt") public void testPrefixNotnullClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNotnullClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNotnullClassIncrement.kt"); doTest(fileName); } @TestMetadata("prefixNullableClassIncrement.kt") public void testPrefixNullableClassIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNullableClassIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNullableClassIncrement.kt"); doTest(fileName); } @TestMetadata("prefixNullableIncrement.kt") public void testPrefixNullableIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNullableIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/increment/prefixNullableIncrement.kt"); doTest(fileName); } } @@ -4552,126 +4552,126 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class InnerNested extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("createNestedClass.kt") public void testCreateNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createNestedClass.kt"); doTest(fileName); } @TestMetadata("createdNestedInOuterMember.kt") public void testCreatedNestedInOuterMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createdNestedInOuterMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createdNestedInOuterMember.kt"); doTest(fileName); } @TestMetadata("dataLocalVariable.kt") public void testDataLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt"); doTest(fileName); } @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionFun.kt"); doTest(fileName); } @TestMetadata("extensionToNested.kt") public void testExtensionToNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionToNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionToNested.kt"); doTest(fileName); } @TestMetadata("importNestedClass.kt") public void testImportNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/importNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/importNestedClass.kt"); doTest(fileName); } @TestMetadata("innerGeneric.kt") public void testInnerGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerGeneric.kt"); doTest(fileName); } @TestMetadata("innerInfixCall.kt") public void testInnerInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerInfixCall.kt"); doTest(fileName); } @TestMetadata("innerLabeledThis.kt") public void testInnerLabeledThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt"); doTest(fileName); } @TestMetadata("innerSimple.kt") public void testInnerSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerSimple.kt"); doTest(fileName); } @TestMetadata("kt3132.kt") public void testKt3132() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt3132.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt3132.kt"); doTest(fileName); } @TestMetadata("kt5363.kt") public void testKt5363() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt5363.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt5363.kt"); doTest(fileName); } @TestMetadata("kt6804.kt") public void testKt6804() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt6804.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt6804.kt"); doTest(fileName); } @TestMetadata("nestedClassInObject.kt") public void testNestedClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassInObject.kt"); doTest(fileName); } @TestMetadata("nestedClassObject.kt") public void testNestedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassObject.kt"); doTest(fileName); } @TestMetadata("nestedEnumConstant.kt") public void testNestedEnumConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt"); doTest(fileName); } @TestMetadata("nestedGeneric.kt") public void testNestedGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedGeneric.kt"); doTest(fileName); } @TestMetadata("nestedInPackage.kt") public void testNestedInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedInPackage.kt"); doTest(fileName); } @TestMetadata("nestedObjects.kt") public void testNestedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedObjects.kt"); doTest(fileName); } @TestMetadata("nestedSimple.kt") public void testNestedSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedSimple.kt"); doTest(fileName); } } @@ -4681,7 +4681,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Instructions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInstructions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/instructions/swap") @@ -4689,18 +4689,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Swap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSwap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("swapRefToSharedVarInt.kt") public void testSwapRefToSharedVarInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarInt.kt"); doTest(fileName); } @TestMetadata("swapRefToSharedVarLong.kt") public void testSwapRefToSharedVarLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarLong.kt"); doTest(fileName); } } @@ -4711,60 +4711,60 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Intrinsics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/compareTo.kt"); doTest(fileName); } @TestMetadata("ea35953.kt") public void testEa35953() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/ea35953.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/ea35953.kt"); doTest(fileName); } @TestMetadata("incWithLabel.kt") public void testIncWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/incWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/incWithLabel.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/infixCall.kt"); doTest(fileName); } @TestMetadata("longRangeWithExplicitDot.kt") public void testLongRangeWithExplicitDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt"); doTest(fileName); } @TestMetadata("prefixIncDec.kt") public void testPrefixIncDec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt"); doTest(fileName); } @TestMetadata("rangeFromCollection.kt") public void testRangeFromCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt"); doTest(fileName); } @TestMetadata("stringFromCollection.kt") public void testStringFromCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt"); doTest(fileName); } @TestMetadata("tostring.kt") public void testTostring() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/tostring.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/tostring.kt"); doTest(fileName); } } @@ -4774,7 +4774,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaInterop extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJavaInterop() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions") @@ -4782,12 +4782,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class NotNullAssertions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNotNullAssertions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mapPut.kt") public void testMapPut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt"); doTest(fileName); } } @@ -4797,42 +4797,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ObjectMethods extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjectMethods() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/objectMethods"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/objectMethods"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cloneCallsConstructor.kt") public void testCloneCallsConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt"); doTest(fileName); } @TestMetadata("cloneCallsSuper.kt") public void testCloneCallsSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt"); doTest(fileName); } @TestMetadata("cloneCallsSuperAndModifies.kt") public void testCloneCallsSuperAndModifies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt"); doTest(fileName); } @TestMetadata("cloneHashSet.kt") public void testCloneHashSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt"); doTest(fileName); } @TestMetadata("cloneHierarchy.kt") public void testCloneHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt"); doTest(fileName); } @TestMetadata("cloneableClassWithoutClone.kt") public void testCloneableClassWithoutClone() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt"); doTest(fileName); } } @@ -4843,42 +4843,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Labels extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/labels"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/labels"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("labeledDeclarations.kt") public void testLabeledDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/labeledDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/labeledDeclarations.kt"); doTest(fileName); } @TestMetadata("propertyAccessor.kt") public void testPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessor.kt"); doTest(fileName); } @TestMetadata("propertyAccessorFunctionLiteral.kt") public void testPropertyAccessorFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("propertyAccessorInnerExtensionFun.kt") public void testPropertyAccessorInnerExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt"); doTest(fileName); } @TestMetadata("propertyAccessorObject.kt") public void testPropertyAccessorObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorObject.kt"); doTest(fileName); } @TestMetadata("propertyInClassAccessor.kt") public void testPropertyInClassAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyInClassAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyInClassAccessor.kt"); doTest(fileName); } } @@ -4888,138 +4888,138 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class LocalClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectInInitializer.kt") public void testAnonymousObjectInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt"); doTest(fileName); } @TestMetadata("anonymousObjectInParameterInitializer.kt") public void testAnonymousObjectInParameterInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt"); doTest(fileName); } @TestMetadata("inExtensionFunction.kt") public void testInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt"); doTest(fileName); } @TestMetadata("inExtensionProperty.kt") public void testInExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionProperty.kt"); doTest(fileName); } @TestMetadata("inLocalExtensionFunction.kt") public void testInLocalExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionFunction.kt"); doTest(fileName); } @TestMetadata("inLocalExtensionProperty.kt") public void testInLocalExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionProperty.kt"); doTest(fileName); } @TestMetadata("innerClassInLocalClass.kt") public void testInnerClassInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/innerClassInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/innerClassInLocalClass.kt"); doTest(fileName); } @TestMetadata("innerOfLocalCaptureExtensionReceiver.kt") public void testInnerOfLocalCaptureExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/innerOfLocalCaptureExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("kt2700.kt") public void testKt2700() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2700.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2700.kt"); doTest(fileName); } @TestMetadata("kt2873.kt") public void testKt2873() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2873.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2873.kt"); doTest(fileName); } @TestMetadata("kt3210.kt") public void testKt3210() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3210.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3210.kt"); doTest(fileName); } @TestMetadata("kt3389.kt") public void testKt3389() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3389.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3389.kt"); doTest(fileName); } @TestMetadata("kt3584.kt") public void testKt3584() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3584.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3584.kt"); doTest(fileName); } @TestMetadata("kt4174.kt") public void testKt4174() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt4174.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt4174.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClass.kt"); doTest(fileName); } @TestMetadata("localClassCaptureExtensionReceiver.kt") public void testLocalClassCaptureExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassCaptureExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassCaptureExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("localClassInInitializer.kt") public void testLocalClassInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInInitializer.kt"); doTest(fileName); } @TestMetadata("localClassInParameterInitializer.kt") public void testLocalClassInParameterInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInParameterInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInParameterInitializer.kt"); doTest(fileName); } @TestMetadata("localExtendsInnerAndReferencesOuterMember.kt") public void testLocalExtendsInnerAndReferencesOuterMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localExtendsInnerAndReferencesOuterMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localExtendsInnerAndReferencesOuterMember.kt"); doTest(fileName); } @TestMetadata("noclosure.kt") public void testNoclosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/noclosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/noclosure.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/object.kt"); doTest(fileName); } @TestMetadata("withclosure.kt") public void testWithclosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/withclosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/withclosure.kt"); doTest(fileName); } } @@ -5029,30 +5029,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Mangling extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMangling() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/mangling"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/mangling"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internalOverride.kt") public void testInternalOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/internalOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/internalOverride.kt"); doTest(fileName); } @TestMetadata("internalOverrideSuperCall.kt") public void testInternalOverrideSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/internalOverrideSuperCall.kt"); doTest(fileName); } @TestMetadata("publicOverride.kt") public void testPublicOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/publicOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/publicOverride.kt"); doTest(fileName); } @TestMetadata("publicOverrideSuperCall.kt") public void testPublicOverrideSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/mangling/publicOverrideSuperCall.kt"); doTest(fileName); } } @@ -5062,78 +5062,78 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiDecl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDecl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ComplexInitializer.kt") public void testComplexInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ComplexInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ComplexInitializer.kt"); doTest(fileName); } @TestMetadata("component.kt") public void testComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/component.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/component.kt"); doTest(fileName); } @TestMetadata("returnInElvis.kt") public void testReturnInElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/returnInElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/returnInElvis.kt"); doTest(fileName); } @TestMetadata("SimpleVals.kt") public void testSimpleVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVals.kt"); doTest(fileName); } @TestMetadata("SimpleValsExtensions.kt") public void testSimpleValsExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleValsExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleValsExtensions.kt"); doTest(fileName); } @TestMetadata("SimpleVarsExtensions.kt") public void testSimpleVarsExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVarsExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVarsExtensions.kt"); doTest(fileName); } @TestMetadata("ValCapturedInFunctionLiteral.kt") public void testValCapturedInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("ValCapturedInLocalFunction.kt") public void testValCapturedInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInLocalFunction.kt"); doTest(fileName); } @TestMetadata("ValCapturedInObjectLiteral.kt") public void testValCapturedInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInObjectLiteral.kt"); doTest(fileName); } @TestMetadata("VarCapturedInFunctionLiteral.kt") public void testVarCapturedInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("VarCapturedInLocalFunction.kt") public void testVarCapturedInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInLocalFunction.kt"); doTest(fileName); } @TestMetadata("VarCapturedInObjectLiteral.kt") public void testVarCapturedInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInObjectLiteral.kt"); doTest(fileName); } @@ -5142,36 +5142,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ForIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } @TestMetadata("MultiDeclForValCaptured.kt") public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt"); doTest(fileName); } @@ -5180,30 +5180,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class LongIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLongIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5214,36 +5214,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ForRange extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForRange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } @TestMetadata("MultiDeclForValCaptured.kt") public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt"); doTest(fileName); } @@ -5252,36 +5252,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeTo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } @TestMetadata("MultiDeclForValCaptured.kt") public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt"); doTest(fileName); } @@ -5290,30 +5290,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5323,30 +5323,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5357,36 +5357,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } @TestMetadata("MultiDeclForValCaptured.kt") public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt"); doTest(fileName); } @@ -5395,30 +5395,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5428,30 +5428,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5462,30 +5462,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5495,30 +5495,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt"); doTest(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTest(fileName); } } @@ -5530,12 +5530,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class ObjectIntrinsics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjectIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("objects.kt") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objectIntrinsics/objects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objectIntrinsics/objects.kt"); doTest(fileName); } } @@ -5545,246 +5545,246 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Objects extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectPropertyInitialization.kt") public void testAnonymousObjectPropertyInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/anonymousObjectPropertyInitialization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/anonymousObjectPropertyInitialization.kt"); doTest(fileName); } @TestMetadata("flist.kt") public void testFlist() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/flist.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/flist.kt"); doTest(fileName); } @TestMetadata("initializationOrder.kt") public void testInitializationOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/initializationOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/initializationOrder.kt"); doTest(fileName); } @TestMetadata("kt1047.kt") public void testKt1047() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1047.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1047.kt"); doTest(fileName); } @TestMetadata("kt1136.kt") public void testKt1136() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1136.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1136.kt"); doTest(fileName); } @TestMetadata("kt1186.kt") public void testKt1186() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1186.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1186.kt"); doTest(fileName); } @TestMetadata("kt1600.kt") public void testKt1600() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1600.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1600.kt"); doTest(fileName); } @TestMetadata("kt1737.kt") public void testKt1737() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1737.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1737.kt"); doTest(fileName); } @TestMetadata("kt2398.kt") public void testKt2398() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2398.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2398.kt"); doTest(fileName); } @TestMetadata("kt2663.kt") public void testKt2663() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663.kt"); doTest(fileName); } @TestMetadata("kt2663_2.kt") public void testKt2663_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663_2.kt"); doTest(fileName); } @TestMetadata("kt2675.kt") public void testKt2675() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2675.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2675.kt"); doTest(fileName); } @TestMetadata("kt2719.kt") public void testKt2719() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2719.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2719.kt"); doTest(fileName); } @TestMetadata("kt2822.kt") public void testKt2822() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2822.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2822.kt"); doTest(fileName); } @TestMetadata("kt3238.kt") public void testKt3238() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3238.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3238.kt"); doTest(fileName); } @TestMetadata("kt3684.kt") public void testKt3684() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3684.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3684.kt"); doTest(fileName); } @TestMetadata("kt4086.kt") public void testKt4086() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt4086.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt4086.kt"); doTest(fileName); } @TestMetadata("kt535.kt") public void testKt535() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt535.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt535.kt"); doTest(fileName); } @TestMetadata("kt560.kt") public void testKt560() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt560.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt560.kt"); doTest(fileName); } @TestMetadata("kt694.kt") public void testKt694() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt694.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt694.kt"); doTest(fileName); } @TestMetadata("localFunctionInObjectInitializer_kt4516.kt") public void testLocalFunctionInObjectInitializer_kt4516() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt"); doTest(fileName); } @TestMetadata("methodOnObject.kt") public void testMethodOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/methodOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/methodOnObject.kt"); doTest(fileName); } @TestMetadata("nestedObjectWithSuperclass.kt") public void testNestedObjectWithSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt"); doTest(fileName); } @TestMetadata("objectExtendsInnerAndReferencesOuterMember.kt") public void testObjectExtendsInnerAndReferencesOuterMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectExtendsInnerAndReferencesOuterMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectExtendsInnerAndReferencesOuterMember.kt"); doTest(fileName); } @TestMetadata("objectInLocalAnonymousObject.kt") public void testObjectInLocalAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt"); doTest(fileName); } @TestMetadata("objectInitialization_kt5523.kt") public void testObjectInitialization_kt5523() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInitialization_kt5523.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInitialization_kt5523.kt"); doTest(fileName); } @TestMetadata("objectLiteral.kt") public void testObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteral.kt"); doTest(fileName); } @TestMetadata("objectLiteralInClosure.kt") public void testObjectLiteralInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt"); doTest(fileName); } @TestMetadata("objectVsClassInitialization_kt5291.kt") public void testObjectVsClassInitialization_kt5291() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectVsClassInitialization_kt5291.kt"); doTest(fileName); } @TestMetadata("objectWithSuperclass.kt") public void testObjectWithSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclass.kt"); doTest(fileName); } @TestMetadata("objectWithSuperclassAndTrait.kt") public void testObjectWithSuperclassAndTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt"); doTest(fileName); } @TestMetadata("privateExtensionFromInitializer_kt4543.kt") public void testPrivateExtensionFromInitializer_kt4543() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateExtensionFromInitializer_kt4543.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateExtensionFromInitializer_kt4543.kt"); doTest(fileName); } @TestMetadata("privateFunctionFromClosureInInitializer_kt5582.kt") public void testPrivateFunctionFromClosureInInitializer_kt5582() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateFunctionFromClosureInInitializer_kt5582.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/privateFunctionFromClosureInInitializer_kt5582.kt"); doTest(fileName); } @TestMetadata("receiverInConstructor.kt") public void testReceiverInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/receiverInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/receiverInConstructor.kt"); doTest(fileName); } @TestMetadata("safeAccess.kt") public void testSafeAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/safeAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/safeAccess.kt"); doTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/simpleObject.kt"); doTest(fileName); } @TestMetadata("thisInConstructor.kt") public void testThisInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/thisInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/thisInConstructor.kt"); doTest(fileName); } @TestMetadata("useAnonymousObjectAsIterator.kt") public void testUseAnonymousObjectAsIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useAnonymousObjectAsIterator.kt"); doTest(fileName); } @TestMetadata("useImportedMember.kt") public void testUseImportedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMember.kt"); doTest(fileName); } @TestMetadata("useImportedMemberFromCompanion.kt") public void testUseImportedMemberFromCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMemberFromCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/useImportedMemberFromCompanion.kt"); doTest(fileName); } } @@ -5794,36 +5794,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class OperatorConventions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperatorConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignmentOperations.kt") public void testAssignmentOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt"); doTest(fileName); } @TestMetadata("incDecOnObject.kt") public void testIncDecOnObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt"); doTest(fileName); } @TestMetadata("kt4152.kt") public void testKt4152() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4152.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4152.kt"); doTest(fileName); } @TestMetadata("kt4987.kt") public void testKt4987() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4987.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4987.kt"); doTest(fileName); } @TestMetadata("kt4991.kt") public void testKt4991() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4991.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4991.kt"); doTest(fileName); } @@ -5832,66 +5832,66 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompareTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCompareTo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boolean.kt") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt"); doTest(fileName); } @TestMetadata("comparable.kt") public void testComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt"); doTest(fileName); } @TestMetadata("doubleInt.kt") public void testDoubleInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleInt.kt"); doTest(fileName); } @TestMetadata("doubleLong.kt") public void testDoubleLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleLong.kt"); doTest(fileName); } @TestMetadata("extensionArray.kt") public void testExtensionArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt"); doTest(fileName); } @TestMetadata("extensionObject.kt") public void testExtensionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt"); doTest(fileName); } @TestMetadata("intDouble.kt") public void testIntDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intDouble.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intDouble.kt"); doTest(fileName); } @TestMetadata("intLong.kt") public void testIntLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intLong.kt"); doTest(fileName); } @TestMetadata("longDouble.kt") public void testLongDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longDouble.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longDouble.kt"); doTest(fileName); } @TestMetadata("longInt.kt") public void testLongInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longInt.kt"); doTest(fileName); } } @@ -5902,54 +5902,54 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Package extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/package"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/package"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boxPrimitiveTypeInClinit.kt") public void testBoxPrimitiveTypeInClinit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt"); doTest(fileName); } @TestMetadata("checkCast.kt") public void testCheckCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/checkCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/checkCast.kt"); doTest(fileName); } @TestMetadata("incrementProperty.kt") public void testIncrementProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/incrementProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/incrementProperty.kt"); doTest(fileName); } @TestMetadata("initializationOrder.kt") public void testInitializationOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/initializationOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/initializationOrder.kt"); doTest(fileName); } @TestMetadata("invokespecial.kt") public void testInvokespecial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/invokespecial.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/invokespecial.kt"); doTest(fileName); } @TestMetadata("nullablePrimitiveNoFieldInitializer.kt") public void testNullablePrimitiveNoFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt"); doTest(fileName); } @TestMetadata("packageQualifiedMethod.kt") public void testPackageQualifiedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/packageQualifiedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/packageQualifiedMethod.kt"); doTest(fileName); } @TestMetadata("privateTopLevelPropAndVarInInner.kt") public void testPrivateTopLevelPropAndVarInInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt"); doTest(fileName); } } @@ -5959,7 +5959,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/platformTypes/primitives") @@ -5967,126 +5967,126 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Primitives extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrimitives() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/platformTypes/primitives"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assign.kt") public void testAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/assign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/assign.kt"); doTest(fileName); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/compareTo.kt"); doTest(fileName); } @TestMetadata("dec.kt") public void testDec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/dec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/dec.kt"); doTest(fileName); } @TestMetadata("div.kt") public void testDiv() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/div.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/div.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/equals.kt"); doTest(fileName); } @TestMetadata("hashCode.kt") public void testHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/hashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/hashCode.kt"); doTest(fileName); } @TestMetadata("identityEquals.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/identityEquals.kt"); doTest(fileName); } @TestMetadata("inc.kt") public void testInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/inc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/inc.kt"); doTest(fileName); } @TestMetadata("minus.kt") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/minus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/minus.kt"); doTest(fileName); } @TestMetadata("mod.kt") public void testMod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/mod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/mod.kt"); doTest(fileName); } @TestMetadata("not.kt") public void testNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/not.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/not.kt"); doTest(fileName); } @TestMetadata("notEquals.kt") public void testNotEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/notEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/notEquals.kt"); doTest(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/plus.kt"); doTest(fileName); } @TestMetadata("plusAssign.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/plusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/plusAssign.kt"); doTest(fileName); } @TestMetadata("rangeTo.kt") public void testRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/rangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/rangeTo.kt"); doTest(fileName); } @TestMetadata("times.kt") public void testTimes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/times.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/times.kt"); doTest(fileName); } @TestMetadata("toShort.kt") public void testToShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/toShort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/toShort.kt"); doTest(fileName); } @TestMetadata("toString.kt") public void testToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/toString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/toString.kt"); doTest(fileName); } @TestMetadata("unaryMinus.kt") public void testUnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/unaryMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/unaryMinus.kt"); doTest(fileName); } @TestMetadata("unaryPlus.kt") public void testUnaryPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/unaryPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/platformTypes/primitives/unaryPlus.kt"); doTest(fileName); } } @@ -6097,300 +6097,300 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class PrimitiveTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrimitiveTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("comparisonWithNaN.kt") public void testComparisonWithNaN() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNaN.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNaN.kt"); doTest(fileName); } @TestMetadata("comparisonWithNullCallsFun.kt") public void testComparisonWithNullCallsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNullCallsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNullCallsFun.kt"); doTest(fileName); } @TestMetadata("ea35963.kt") public void testEa35963() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/ea35963.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/ea35963.kt"); doTest(fileName); } @TestMetadata("equalsHashCodeToString.kt") public void testEqualsHashCodeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/equalsHashCodeToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/equalsHashCodeToString.kt"); doTest(fileName); } @TestMetadata("incrementByteCharShort.kt") public void testIncrementByteCharShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/incrementByteCharShort.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/incrementByteCharShort.kt"); doTest(fileName); } @TestMetadata("intLiteralIsNotNull.kt") public void testIntLiteralIsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt"); doTest(fileName); } @TestMetadata("kt1054.kt") public void testKt1054() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1054.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1054.kt"); doTest(fileName); } @TestMetadata("kt1055.kt") public void testKt1055() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1055.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1055.kt"); doTest(fileName); } @TestMetadata("kt1093.kt") public void testKt1093() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1093.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1093.kt"); doTest(fileName); } @TestMetadata("kt1508.kt") public void testKt1508() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt"); doTest(fileName); } @TestMetadata("kt1634.kt") public void testKt1634() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1634.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1634.kt"); doTest(fileName); } @TestMetadata("kt2251.kt") public void testKt2251() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2251.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2251.kt"); doTest(fileName); } @TestMetadata("kt2269.kt") public void testKt2269() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2269.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2269.kt"); doTest(fileName); } @TestMetadata("kt2275.kt") public void testKt2275() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2275.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2275.kt"); doTest(fileName); } @TestMetadata("kt239.kt") public void testKt239() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt239.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt239.kt"); doTest(fileName); } @TestMetadata("kt242.kt") public void testKt242() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt242.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt242.kt"); doTest(fileName); } @TestMetadata("kt243.kt") public void testKt243() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt243.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt243.kt"); doTest(fileName); } @TestMetadata("kt248.kt") public void testKt248() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt248.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt248.kt"); doTest(fileName); } @TestMetadata("kt2768.kt") public void testKt2768() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2768.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2768.kt"); doTest(fileName); } @TestMetadata("kt2794.kt") public void testKt2794() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2794.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2794.kt"); doTest(fileName); } @TestMetadata("kt3078.kt") public void testKt3078() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3078.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3078.kt"); doTest(fileName); } @TestMetadata("kt3517.kt") public void testKt3517() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3517.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3517.kt"); doTest(fileName); } @TestMetadata("kt3576.kt") public void testKt3576() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3576.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3576.kt"); doTest(fileName); } @TestMetadata("kt3613.kt") public void testKt3613() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3613.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3613.kt"); doTest(fileName); } @TestMetadata("kt4097.kt") public void testKt4097() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4097.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4097.kt"); doTest(fileName); } @TestMetadata("kt4098.kt") public void testKt4098() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4098.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4098.kt"); doTest(fileName); } @TestMetadata("kt4210.kt") public void testKt4210() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4210.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4210.kt"); doTest(fileName); } @TestMetadata("kt4251.kt") public void testKt4251() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4251.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4251.kt"); doTest(fileName); } @TestMetadata("kt446.kt") public void testKt446() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt446.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt446.kt"); doTest(fileName); } @TestMetadata("kt518.kt") public void testKt518() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt518.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt518.kt"); doTest(fileName); } @TestMetadata("kt6590_identityEquals.kt") public void testKt6590_identityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt6590_identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt6590_identityEquals.kt"); doTest(fileName); } @TestMetadata("kt665.kt") public void testKt665() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt665.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt665.kt"); doTest(fileName); } @TestMetadata("kt684.kt") public void testKt684() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt684.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt684.kt"); doTest(fileName); } @TestMetadata("kt711.kt") public void testKt711() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt711.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt711.kt"); doTest(fileName); } @TestMetadata("kt737.kt") public void testKt737() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt737.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt737.kt"); doTest(fileName); } @TestMetadata("kt752.kt") public void testKt752() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt752.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt752.kt"); doTest(fileName); } @TestMetadata("kt753.kt") public void testKt753() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt753.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt753.kt"); doTest(fileName); } @TestMetadata("kt756.kt") public void testKt756() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt756.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt756.kt"); doTest(fileName); } @TestMetadata("kt757.kt") public void testKt757() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt757.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt757.kt"); doTest(fileName); } @TestMetadata("kt828.kt") public void testKt828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt828.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt828.kt"); doTest(fileName); } @TestMetadata("kt877.kt") public void testKt877() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt877.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt877.kt"); doTest(fileName); } @TestMetadata("kt882.kt") public void testKt882() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt882.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt882.kt"); doTest(fileName); } @TestMetadata("kt887.kt") public void testKt887() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt887.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt887.kt"); doTest(fileName); } @TestMetadata("kt935.kt") public void testKt935() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt935.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt935.kt"); doTest(fileName); } @TestMetadata("nullAsNullableIntIsNull.kt") public void testNullAsNullableIntIsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt"); doTest(fileName); } @TestMetadata("nullableCharBoolean.kt") public void testNullableCharBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullableCharBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullableCharBoolean.kt"); doTest(fileName); } @TestMetadata("rangeTo.kt") public void testRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt"); doTest(fileName); } @TestMetadata("substituteIntForGeneric.kt") public void testSubstituteIntForGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/substituteIntForGeneric.kt"); doTest(fileName); } @TestMetadata("unboxComparable.kt") public void testUnboxComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt"); doTest(fileName); } } @@ -6400,78 +6400,78 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class PrivateConstructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrivateConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/privateConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/privateConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("base.kt") public void testBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/base.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/base.kt"); doTest(fileName); } @TestMetadata("captured.kt") public void testCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/captured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/captured.kt"); doTest(fileName); } @TestMetadata("companion.kt") public void testCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/companion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/companion.kt"); doTest(fileName); } @TestMetadata("inline.kt") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/inline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/inline.kt"); doTest(fileName); } @TestMetadata("inner.kt") public void testInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/inner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/inner.kt"); doTest(fileName); } @TestMetadata("kt4860.kt") public void testKt4860() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/kt4860.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/kt4860.kt"); doTest(fileName); } @TestMetadata("secondary.kt") public void testSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/secondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/secondary.kt"); doTest(fileName); } @TestMetadata("withArguments.kt") public void testWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withArguments.kt"); doTest(fileName); } @TestMetadata("withDefault.kt") public void testWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withDefault.kt"); doTest(fileName); } @TestMetadata("withLinkedClasses.kt") public void testWithLinkedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withLinkedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withLinkedClasses.kt"); doTest(fileName); } @TestMetadata("withLinkedObjects.kt") public void testWithLinkedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withLinkedObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withLinkedObjects.kt"); doTest(fileName); } @TestMetadata("withVarargs.kt") public void testWithVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withVarargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/privateConstructors/withVarargs.kt"); doTest(fileName); } } @@ -6482,263 +6482,263 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class Properties extends AbstractBlackBoxCodegenTest { @TestMetadata("accessToPrivateProperty.kt") public void testAccessToPrivateProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateProperty.kt"); doTest(fileName); } @TestMetadata("accessToPrivateSetter.kt") public void testAccessToPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateSetter.kt"); doTest(fileName); } public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classArtificialFieldInsideNested.kt") public void testClassArtificialFieldInsideNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classArtificialFieldInsideNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classArtificialFieldInsideNested.kt"); doTest(fileName); } @TestMetadata("classFieldInsideLambda.kt") public void testClassFieldInsideLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideLambda.kt"); doTest(fileName); } @TestMetadata("classFieldInsideLocalInSetter.kt") public void testClassFieldInsideLocalInSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideLocalInSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideLocalInSetter.kt"); doTest(fileName); } @TestMetadata("classFieldInsideNested.kt") public void testClassFieldInsideNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classFieldInsideNested.kt"); doTest(fileName); } @TestMetadata("classObjectProperties.kt") public void testClassObjectProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classObjectProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classObjectProperties.kt"); doTest(fileName); } @TestMetadata("classPrivateArtificialFieldInsideNested.kt") public void testClassPrivateArtificialFieldInsideNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classPrivateArtificialFieldInsideNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classPrivateArtificialFieldInsideNested.kt"); doTest(fileName); } @TestMetadata("companionFieldInsideLambda.kt") public void testCompanionFieldInsideLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionFieldInsideLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/companionFieldInsideLambda.kt"); doTest(fileName); } @TestMetadata("field.kt") public void testField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/field.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/field.kt"); doTest(fileName); } @TestMetadata("fieldInClass.kt") public void testFieldInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInClass.kt"); doTest(fileName); } @TestMetadata("fieldInsideField.kt") public void testFieldInsideField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideField.kt"); doTest(fileName); } @TestMetadata("fieldInsideLambda.kt") public void testFieldInsideLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideLambda.kt"); doTest(fileName); } @TestMetadata("fieldInsideNested.kt") public void testFieldInsideNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldInsideNested.kt"); doTest(fileName); } @TestMetadata("fieldSimple.kt") public void testFieldSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/fieldSimple.kt"); doTest(fileName); } @TestMetadata("generalAccess.kt") public void testGeneralAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/generalAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/generalAccess.kt"); doTest(fileName); } @TestMetadata("kt1159.kt") public void testKt1159() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1159.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1159.kt"); doTest(fileName); } @TestMetadata("kt1165.kt") public void testKt1165() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1165.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1165.kt"); doTest(fileName); } @TestMetadata("kt1168.kt") public void testKt1168() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1168.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1168.kt"); doTest(fileName); } @TestMetadata("kt1170.kt") public void testKt1170() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1170.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1170.kt"); doTest(fileName); } @TestMetadata("kt1398.kt") public void testKt1398() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1398.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1398.kt"); doTest(fileName); } @TestMetadata("kt1417.kt") public void testKt1417() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1417.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1417.kt"); doTest(fileName); } @TestMetadata("kt1482_2279.kt") public void testKt1482_2279() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1482_2279.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1482_2279.kt"); doTest(fileName); } @TestMetadata("kt1714.kt") public void testKt1714() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714.kt"); doTest(fileName); } @TestMetadata("kt1714_minimal.kt") public void testKt1714_minimal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714_minimal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714_minimal.kt"); doTest(fileName); } @TestMetadata("kt1892.kt") public void testKt1892() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1892.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1892.kt"); doTest(fileName); } @TestMetadata("kt2331.kt") public void testKt2331() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2331.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2331.kt"); doTest(fileName); } @TestMetadata("kt257.kt") public void testKt257() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt257.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt257.kt"); doTest(fileName); } @TestMetadata("kt2655.kt") public void testKt2655() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2655.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2655.kt"); doTest(fileName); } @TestMetadata("kt2786.kt") public void testKt2786() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2786.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2786.kt"); doTest(fileName); } @TestMetadata("kt2892.kt") public void testKt2892() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2892.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2892.kt"); doTest(fileName); } @TestMetadata("kt3118.kt") public void testKt3118() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3118.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3118.kt"); doTest(fileName); } @TestMetadata("kt3524.kt") public void testKt3524() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3524.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3524.kt"); doTest(fileName); } @TestMetadata("kt3551.kt") public void testKt3551() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3551.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3551.kt"); doTest(fileName); } @TestMetadata("kt3556.kt") public void testKt3556() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3556.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3556.kt"); doTest(fileName); } @TestMetadata("kt3930.kt") public void testKt3930() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3930.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3930.kt"); doTest(fileName); } @TestMetadata("kt4140.kt") public void testKt4140() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4140.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4140.kt"); doTest(fileName); } @TestMetadata("kt4252.kt") public void testKt4252() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252.kt"); doTest(fileName); } @TestMetadata("kt4252_2.kt") public void testKt4252_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252_2.kt"); doTest(fileName); } @TestMetadata("kt4340.kt") public void testKt4340() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4340.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4340.kt"); doTest(fileName); } @TestMetadata("kt4373.kt") public void testKt4373() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4373.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4373.kt"); doTest(fileName); } @TestMetadata("kt4383.kt") public void testKt4383() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4383.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4383.kt"); doTest(fileName); } @TestMetadata("kt613.kt") public void testKt613() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt613.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt613.kt"); doTest(fileName); } @@ -6750,37 +6750,37 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("kt9603.kt") public void testKt9603() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt9603.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt9603.kt"); doTest(fileName); } @TestMetadata("primitiveOverrideDefaultAccessor.kt") public void testPrimitiveOverrideDefaultAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDefaultAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDefaultAccessor.kt"); doTest(fileName); } @TestMetadata("primitiveOverrideDelegateAccessor.kt") public void testPrimitiveOverrideDelegateAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt"); doTest(fileName); } @TestMetadata("privatePropertyInConstructor.kt") public void testPrivatePropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("privatePropertyWithoutBackingField.kt") public void testPrivatePropertyWithoutBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt"); doTest(fileName); } @TestMetadata("twoAnnotatedExtensionPropertiesWithoutBackingFields.kt") public void testTwoAnnotatedExtensionPropertiesWithoutBackingFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt"); doTest(fileName); } @@ -6790,47 +6790,47 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class Lateinit extends AbstractBlackBoxCodegenTest { @TestMetadata("accessor.kt") public void testAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/accessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/accessor.kt"); doTest(fileName); } @TestMetadata("accessorException.kt") public void testAccessorException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/accessorException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/accessorException.kt"); doTest(fileName); } public void testAllFilesPresentInLateinit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/properties/lateinit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("exceptionField.kt") public void testExceptionField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/exceptionField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/exceptionField.kt"); doTest(fileName); } @TestMetadata("exceptionGetter.kt") public void testExceptionGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/exceptionGetter.kt"); doTest(fileName); } @TestMetadata("override.kt") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/override.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/override.kt"); doTest(fileName); } @TestMetadata("overrideException.kt") public void testOverrideException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/overrideException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/overrideException.kt"); doTest(fileName); } @TestMetadata("simpleVar.kt") public void testSimpleVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/simpleVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/lateinit/simpleVar.kt"); doTest(fileName); } } @@ -6841,12 +6841,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionLiteralGenericSignature.kt") public void testFunctionLiteralGenericSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt"); doTest(fileName); } } @@ -6856,72 +6856,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Regressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ea49318.kt") public void testEa49318() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/ea49318.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/ea49318.kt"); doTest(fileName); } @TestMetadata("kt3107.kt") public void testKt3107() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3107.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3107.kt"); doTest(fileName); } @TestMetadata("kt3173.kt") public void testKt3173() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3173.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3173.kt"); doTest(fileName); } @TestMetadata("kt3421.kt") public void testKt3421() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3421.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3421.kt"); doTest(fileName); } @TestMetadata("kt3587.kt") public void testKt3587() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3587.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3587.kt"); doTest(fileName); } @TestMetadata("kt3903.kt") public void testKt3903() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3903.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3903.kt"); doTest(fileName); } @TestMetadata("kt3999.kt") public void testKt3999() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3999.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3999.kt"); doTest(fileName); } @TestMetadata("kt4281.kt") public void testKt4281() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4281.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4281.kt"); doTest(fileName); } @TestMetadata("kt4682.kt") public void testKt4682() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4682.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4682.kt"); doTest(fileName); } @TestMetadata("kt6153.kt") public void testKt6153() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt6153.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt6153.kt"); doTest(fileName); } @TestMetadata("unjustifiedReferenceTarget.kt") public void testUnjustifiedReferenceTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt"); doTest(fileName); } } @@ -6931,60 +6931,60 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class SafeCall extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSafeCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") public void testGenericNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/genericNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/genericNull.kt"); doTest(fileName); } @TestMetadata("kt1572.kt") public void testKt1572() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt1572.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt1572.kt"); doTest(fileName); } @TestMetadata("kt232.kt") public void testKt232() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt232.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt232.kt"); doTest(fileName); } @TestMetadata("kt245.kt") public void testKt245() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt245.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt245.kt"); doTest(fileName); } @TestMetadata("kt247.kt") public void testKt247() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt247.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt247.kt"); doTest(fileName); } @TestMetadata("kt3430.kt") public void testKt3430() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt3430.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt3430.kt"); doTest(fileName); } @TestMetadata("kt4733.kt") public void testKt4733() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt4733.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt4733.kt"); doTest(fileName); } @TestMetadata("primitive.kt") public void testPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/primitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/primitive.kt"); doTest(fileName); } @TestMetadata("safeCallOnLong.kt") public void testSafeCallOnLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/safeCallOnLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/safeCallOnLong.kt"); doTest(fileName); } } @@ -6994,72 +6994,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class SamConstructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSamConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("comparator.kt") public void testComparator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/comparator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/comparator.kt"); doTest(fileName); } @TestMetadata("filenameFilter.kt") public void testFilenameFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/filenameFilter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/filenameFilter.kt"); doTest(fileName); } @TestMetadata("nonLiteralComparator.kt") public void testNonLiteralComparator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt"); doTest(fileName); } @TestMetadata("nonLiteralFilenameFilter.kt") public void testNonLiteralFilenameFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt"); doTest(fileName); } @TestMetadata("nonLiteralRunnable.kt") public void testNonLiteralRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt"); doTest(fileName); } @TestMetadata("nonTrivialRunnable.kt") public void testNonTrivialRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt"); doTest(fileName); } @TestMetadata("runnable.kt") public void testRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnable.kt"); doTest(fileName); } @TestMetadata("runnableAccessingClosure1.kt") public void testRunnableAccessingClosure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt"); doTest(fileName); } @TestMetadata("runnableAccessingClosure2.kt") public void testRunnableAccessingClosure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt"); doTest(fileName); } @TestMetadata("sameWrapperClass.kt") public void testSameWrapperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt"); doTest(fileName); } @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt"); doTest(fileName); } } @@ -7069,18 +7069,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Sealed extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSealed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/sealed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/sealed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("objects.kt") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/sealed/objects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sealed/objects.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/sealed/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/sealed/simple.kt"); doTest(fileName); } } @@ -7091,125 +7091,125 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public static class SecondaryConstructors extends AbstractBlackBoxCodegenTest { @TestMetadata("accessToCompanion.kt") public void testAccessToCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt"); doTest(fileName); } @TestMetadata("accessToNestedObject.kt") public void testAccessToNestedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToNestedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToNestedObject.kt"); doTest(fileName); } public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basicNoPrimaryManySinks.kt") public void testBasicNoPrimaryManySinks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt"); doTest(fileName); } @TestMetadata("basicNoPrimaryOneSink.kt") public void testBasicNoPrimaryOneSink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt"); doTest(fileName); } @TestMetadata("basicPrimary.kt") public void testBasicPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt"); doTest(fileName); } @TestMetadata("clashingDefaultConstructors.kt") public void testClashingDefaultConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/clashingDefaultConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/clashingDefaultConstructors.kt"); doTest(fileName); } @TestMetadata("dataClasses.kt") public void testDataClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/dataClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/dataClasses.kt"); doTest(fileName); } @TestMetadata("defaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/defaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/defaultArgs.kt"); doTest(fileName); } @TestMetadata("delegationWithPrimary.kt") public void testDelegationWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt"); doTest(fileName); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/enums.kt"); doTest(fileName); } @TestMetadata("generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/generics.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt"); doTest(fileName); } @TestMetadata("innerClassesInheritance.kt") public void testInnerClassesInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt"); doTest(fileName); } @TestMetadata("localClasses.kt") public void testLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClasses.kt"); doTest(fileName); } @TestMetadata("superCallPrimary.kt") public void testSuperCallPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt"); doTest(fileName); } @TestMetadata("superCallSecondary.kt") public void testSuperCallSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallSecondary.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/varargs.kt"); doTest(fileName); } @TestMetadata("withNonLocalReturn.kt") public void testWithNonLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); doTest(fileName); } @TestMetadata("withReturn.kt") public void testWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturn.kt"); doTest(fileName); } @TestMetadata("withReturnUnit.kt") public void testWithReturnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); doTest(fileName); } } @@ -7219,54 +7219,54 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class StaticFields extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousInitializerIObject.kt") public void testAnonymousInitializerIObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt"); doTest(fileName); } @TestMetadata("anonymousInitializerInClassObject.kt") public void testAnonymousInitializerInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt"); doTest(fileName); } @TestMetadata("incInClassObject.kt") public void testIncInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInClassObject.kt"); doTest(fileName); } @TestMetadata("incInObject.kt") public void testIncInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/incInObject.kt"); doTest(fileName); } @TestMetadata("inheritedPropertyInClassObject.kt") public void testInheritedPropertyInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInClassObject.kt"); doTest(fileName); } @TestMetadata("inheritedPropertyInObject.kt") public void testInheritedPropertyInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/inheritedPropertyInObject.kt"); doTest(fileName); } @TestMetadata("kt8089.kt") public void testKt8089() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/kt8089.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/kt8089.kt"); doTest(fileName); } @TestMetadata("syntheticAccessor.kt") public void testSyntheticAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/syntheticAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/staticFields/syntheticAccessor.kt"); doTest(fileName); } } @@ -7276,84 +7276,84 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Strings extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStrings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/strings"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/strings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ea35743.kt") public void testEa35743() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/ea35743.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/ea35743.kt"); doTest(fileName); } @TestMetadata("interpolation.kt") public void testInterpolation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/interpolation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/interpolation.kt"); doTest(fileName); } @TestMetadata("kt2592.kt") public void testKt2592() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt2592.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt2592.kt"); doTest(fileName); } @TestMetadata("kt3571.kt") public void testKt3571() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt3571.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt3571.kt"); doTest(fileName); } @TestMetadata("kt3652.kt") public void testKt3652() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt3652.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt3652.kt"); doTest(fileName); } @TestMetadata("kt5956.kt") public void testKt5956() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt5956.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt5956.kt"); doTest(fileName); } @TestMetadata("kt881.kt") public void testKt881() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt881.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt881.kt"); doTest(fileName); } @TestMetadata("kt889.kt") public void testKt889() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt889.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt889.kt"); doTest(fileName); } @TestMetadata("kt894.kt") public void testKt894() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt894.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt894.kt"); doTest(fileName); } @TestMetadata("multilineStringsWithTemplates.kt") public void testMultilineStringsWithTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt"); doTest(fileName); } @TestMetadata("rawStrings.kt") public void testRawStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStrings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStrings.kt"); doTest(fileName); } @TestMetadata("rawStringsWithManyQuotes.kt") public void testRawStringsWithManyQuotes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt"); doTest(fileName); } @TestMetadata("stringBuilderAppend.kt") public void testStringBuilderAppend() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/stringBuilderAppend.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/stringBuilderAppend.kt"); doTest(fileName); } } @@ -7363,138 +7363,138 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Super extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/super"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basicmethodSuperClass.kt") public void testBasicmethodSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperClass.kt"); doTest(fileName); } @TestMetadata("basicmethodSuperTrait.kt") public void testBasicmethodSuperTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperTrait.kt"); doTest(fileName); } @TestMetadata("basicproperty.kt") public void testBasicproperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicproperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicproperty.kt"); doTest(fileName); } @TestMetadata("enclosedFun.kt") public void testEnclosedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedFun.kt"); doTest(fileName); } @TestMetadata("enclosedVar.kt") public void testEnclosedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedVar.kt"); doTest(fileName); } @TestMetadata("innerClassLabeledSuper.kt") public void testInnerClassLabeledSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt"); doTest(fileName); } @TestMetadata("innerClassLabeledSuper2.kt") public void testInnerClassLabeledSuper2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt"); doTest(fileName); } @TestMetadata("innerClassLabeledSuperProperty.kt") public void testInnerClassLabeledSuperProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt"); doTest(fileName); } @TestMetadata("innerClassLabeledSuperProperty2.kt") public void testInnerClassLabeledSuperProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt"); doTest(fileName); } @TestMetadata("kt3492ClassFun.kt") public void testKt3492ClassFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassFun.kt"); doTest(fileName); } @TestMetadata("kt3492ClassProperty.kt") public void testKt3492ClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassProperty.kt"); doTest(fileName); } @TestMetadata("kt3492TraitFun.kt") public void testKt3492TraitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitFun.kt"); doTest(fileName); } @TestMetadata("kt3492TraitProperty.kt") public void testKt3492TraitProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitProperty.kt"); doTest(fileName); } @TestMetadata("kt4173.kt") public void testKt4173() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173.kt"); doTest(fileName); } @TestMetadata("kt4173_2.kt") public void testKt4173_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_2.kt"); doTest(fileName); } @TestMetadata("kt4173_3.kt") public void testKt4173_3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_3.kt"); doTest(fileName); } @TestMetadata("kt4982.kt") public void testKt4982() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4982.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4982.kt"); doTest(fileName); } @TestMetadata("multipleSuperTraits.kt") public void testMultipleSuperTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/multipleSuperTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/multipleSuperTraits.kt"); doTest(fileName); } @TestMetadata("traitproperty.kt") public void testTraitproperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/traitproperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/traitproperty.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuper.kt") public void testUnqualifiedSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuper.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithDeeperHierarchies.kt") public void testUnqualifiedSuperWithDeeperHierarchies() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuperWithDeeperHierarchies.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuperWithDeeperHierarchies.kt"); doTest(fileName); } @TestMetadata("unqualifiedSuperWithMethodsOfAny.kt") public void testUnqualifiedSuperWithMethodsOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuperWithMethodsOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/super/unqualifiedSuperWithMethodsOfAny.kt"); doTest(fileName); } } @@ -7504,96 +7504,96 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class SuperConstructorCall extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSuperConstructorCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deepInnerHierarchy.kt") public void testDeepInnerHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt"); doTest(fileName); } @TestMetadata("deepLocalHierarchy.kt") public void testDeepLocalHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt"); doTest(fileName); } @TestMetadata("innerExtendsOuter.kt") public void testInnerExtendsOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt"); doTest(fileName); } @TestMetadata("localClassOuterDiffersFromInnerOuter.kt") public void testLocalClassOuterDiffersFromInnerOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localClassOuterDiffersFromInnerOuter.kt"); doTest(fileName); } @TestMetadata("localExtendsLocalWithClosure.kt") public void testLocalExtendsLocalWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt"); doTest(fileName); } @TestMetadata("localWithClosureExtendsLocalWithClosure.kt") public void testLocalWithClosureExtendsLocalWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt"); doTest(fileName); } @TestMetadata("objectExtendsClassDefaultArgument.kt") public void testObjectExtendsClassDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt"); doTest(fileName); } @TestMetadata("objectExtendsClassVararg.kt") public void testObjectExtendsClassVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt"); doTest(fileName); } @TestMetadata("objectExtendsInner.kt") public void testObjectExtendsInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt"); doTest(fileName); } @TestMetadata("objectExtendsInnerDefaultArgument.kt") public void testObjectExtendsInnerDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt"); doTest(fileName); } @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt") public void testObjectExtendsInnerOfLocalVarargAndDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt"); doTest(fileName); } @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt") public void testObjectExtendsInnerOfLocalWithCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt"); doTest(fileName); } @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt") public void testObjectExtendsLocalCaptureInSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt"); doTest(fileName); } @TestMetadata("objectExtendsLocalWithClosure.kt") public void testObjectExtendsLocalWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt"); doTest(fileName); } @TestMetadata("objectOuterDiffersFromInnerOuter.kt") public void testObjectOuterDiffersFromInnerOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectOuterDiffersFromInnerOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectOuterDiffersFromInnerOuter.kt"); doTest(fileName); } } @@ -7603,150 +7603,150 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Traits extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTraits() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("diamondPropertyAccessors.kt") public void testDiamondPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/diamondPropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/diamondPropertyAccessors.kt"); doTest(fileName); } @TestMetadata("finalMethod.kt") public void testFinalMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/finalMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/finalMethod.kt"); doTest(fileName); } @TestMetadata("genericMethod.kt") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/genericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/genericMethod.kt"); doTest(fileName); } @TestMetadata("indirectlyInheritPropertyGetter.kt") public void testIndirectlyInheritPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/indirectlyInheritPropertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/indirectlyInheritPropertyGetter.kt"); doTest(fileName); } @TestMetadata("inheritedFun.kt") public void testInheritedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedFun.kt"); doTest(fileName); } @TestMetadata("inheritedVar.kt") public void testInheritedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedVar.kt"); doTest(fileName); } @TestMetadata("kt1936.kt") public void testKt1936() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936.kt"); doTest(fileName); } @TestMetadata("kt1936_1.kt") public void testKt1936_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936_1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936_1.kt"); doTest(fileName); } @TestMetadata("kt2260.kt") public void testKt2260() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2260.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2260.kt"); doTest(fileName); } @TestMetadata("kt2399.kt") public void testKt2399() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2399.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2399.kt"); doTest(fileName); } @TestMetadata("kt2541.kt") public void testKt2541() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2541.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2541.kt"); doTest(fileName); } @TestMetadata("kt3315.kt") public void testKt3315() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3315.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3315.kt"); doTest(fileName); } @TestMetadata("kt3500.kt") public void testKt3500() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3500.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3500.kt"); doTest(fileName); } @TestMetadata("kt3579.kt") public void testKt3579() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3579.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3579.kt"); doTest(fileName); } @TestMetadata("kt3579_2.kt") public void testKt3579_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3579_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3579_2.kt"); doTest(fileName); } @TestMetadata("kt5393.kt") public void testKt5393() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt5393.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt5393.kt"); doTest(fileName); } @TestMetadata("kt5393_property.kt") public void testKt5393_property() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt5393_property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt5393_property.kt"); doTest(fileName); } @TestMetadata("multiple.kt") public void testMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/multiple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/multiple.kt"); doTest(fileName); } @TestMetadata("traitImplDelegationWithCovariantOverride.kt") public void testTraitImplDelegationWithCovariantOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplDelegationWithCovariantOverride.kt"); doTest(fileName); } @TestMetadata("traitImplDiamond.kt") public void testTraitImplDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplDiamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplDiamond.kt"); doTest(fileName); } @TestMetadata("traitImplGenericDelegation.kt") public void testTraitImplGenericDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitImplGenericDelegation.kt"); doTest(fileName); } @TestMetadata("traitWithPrivateExtension.kt") public void testTraitWithPrivateExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateExtension.kt"); doTest(fileName); } @TestMetadata("traitWithPrivateMember.kt") public void testTraitWithPrivateMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateMember.kt"); doTest(fileName); } @TestMetadata("traitWithPrivateMemberAccessFromLambda.kt") public void testTraitWithPrivateMemberAccessFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateMemberAccessFromLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/traitWithPrivateMemberAccessFromLambda.kt"); doTest(fileName); } } @@ -7756,42 +7756,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeInfo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeInfo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("asInLoop.kt") public void testAsInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/asInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/asInLoop.kt"); doTest(fileName); } @TestMetadata("implicitSmartCastThis.kt") public void testImplicitSmartCastThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/implicitSmartCastThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/implicitSmartCastThis.kt"); doTest(fileName); } @TestMetadata("inheritance.kt") public void testInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/inheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/inheritance.kt"); doTest(fileName); } @TestMetadata("kt2811.kt") public void testKt2811() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/kt2811.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/kt2811.kt"); doTest(fileName); } @TestMetadata("primitiveTypeInfo.kt") public void testPrimitiveTypeInfo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt"); doTest(fileName); } @TestMetadata("smartCastThis.kt") public void testSmartCastThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/smartCastThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/smartCastThis.kt"); doTest(fileName); } } @@ -7801,42 +7801,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeMapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2831.kt") public void testKt2831() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt2831.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt2831.kt"); doTest(fileName); } @TestMetadata("kt3286.kt") public void testKt3286() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3286.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3286.kt"); doTest(fileName); } @TestMetadata("kt3863.kt") public void testKt3863() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3863.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3863.kt"); doTest(fileName); } @TestMetadata("kt3976.kt") public void testKt3976() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3976.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3976.kt"); doTest(fileName); } @TestMetadata("nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nothing.kt"); doTest(fileName); } @TestMetadata("nullableNothing.kt") public void testNullableNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nullableNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nullableNothing.kt"); doTest(fileName); } } @@ -7846,42 +7846,42 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnaryOp extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInUnaryOp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unaryOp"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unaryOp"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/call.kt"); doTest(fileName); } @TestMetadata("callNullable.kt") public void testCallNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callNullable.kt"); doTest(fileName); } @TestMetadata("callWithCommonType.kt") public void testCallWithCommonType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callWithCommonType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callWithCommonType.kt"); doTest(fileName); } @TestMetadata("intrinsic.kt") public void testIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsic.kt"); doTest(fileName); } @TestMetadata("intrinsicNullable.kt") public void testIntrinsicNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsicNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsicNullable.kt"); doTest(fileName); } @TestMetadata("longOverflow.kt") public void testLongOverflow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/longOverflow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/longOverflow.kt"); doTest(fileName); } } @@ -7891,72 +7891,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unit extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInUnit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unit"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("closureReturnsNullableUnit.kt") public void testClosureReturnsNullableUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt"); doTest(fileName); } @TestMetadata("ifElse.kt") public void testIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/ifElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/ifElse.kt"); doTest(fileName); } @TestMetadata("kt3634.kt") public void testKt3634() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt3634.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt3634.kt"); doTest(fileName); } @TestMetadata("kt4212.kt") public void testKt4212() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4212.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4212.kt"); doTest(fileName); } @TestMetadata("kt4265.kt") public void testKt4265() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4265.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4265.kt"); doTest(fileName); } @TestMetadata("nullableUnit.kt") public void testNullableUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnit.kt"); doTest(fileName); } @TestMetadata("nullableUnitInWhen1.kt") public void testNullableUnitInWhen1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen1.kt"); doTest(fileName); } @TestMetadata("nullableUnitInWhen2.kt") public void testNullableUnitInWhen2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen2.kt"); doTest(fileName); } @TestMetadata("nullableUnitInWhen3.kt") public void testNullableUnitInWhen3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt"); doTest(fileName); } @TestMetadata("unitClassObject.kt") public void testUnitClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/unitClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/unitClassObject.kt"); doTest(fileName); } @TestMetadata("UnitValue.kt") public void testUnitValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/UnitValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/UnitValue.kt"); doTest(fileName); } } @@ -7966,36 +7966,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1978.kt") public void testKt1978() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt1978.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt1978.kt"); doTest(fileName); } @TestMetadata("kt581.kt") public void testKt581() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt581.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt581.kt"); doTest(fileName); } @TestMetadata("kt6192.kt") public void testKt6192() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt6192.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt6192.kt"); doTest(fileName); } @TestMetadata("kt796_797.kt") public void testKt796_797() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt796_797.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt796_797.kt"); doTest(fileName); } @TestMetadata("varargsAndFunctionLiterals.kt") public void testVarargsAndFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt"); doTest(fileName); } } @@ -8005,126 +8005,126 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callProperty.kt") public void testCallProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/callProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/callProperty.kt"); doTest(fileName); } @TestMetadata("exhaustiveBoolean.kt") public void testExhaustiveBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/exhaustiveBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/exhaustiveBoolean.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/is.kt"); doTest(fileName); } @TestMetadata("kt2457.kt") public void testKt2457() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2457.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2457.kt"); doTest(fileName); } @TestMetadata("kt2466.kt") public void testKt2466() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2466.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2466.kt"); doTest(fileName); } @TestMetadata("kt5307.kt") public void testKt5307() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt5307.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt5307.kt"); doTest(fileName); } @TestMetadata("longInRange.kt") public void testLongInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/longInRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/longInRange.kt"); doTest(fileName); } @TestMetadata("matchNotNullAgainstNullable.kt") public void testMatchNotNullAgainstNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt"); doTest(fileName); } @TestMetadata("noElseAssigned.kt") public void testNoElseAssigned() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssigned.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssigned.kt"); doTest(fileName); } @TestMetadata("noElseAssignedNoMatch.kt") public void testNoElseAssignedNoMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssignedNoMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssignedNoMatch.kt"); doTest(fileName); } @TestMetadata("noElseExhaustive.kt") public void testNoElseExhaustive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustive.kt"); doTest(fileName); } @TestMetadata("noElseExhaustiveStatement.kt") public void testNoElseExhaustiveStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt"); doTest(fileName); } @TestMetadata("noElseExhaustiveUnitExpected.kt") public void testNoElseExhaustiveUnitExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt"); doTest(fileName); } @TestMetadata("noElseInRetunedExpression.kt") public void testNoElseInRetunedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpression.kt"); doTest(fileName); } @TestMetadata("noElseInRetunedExpressionNoMatch.kt") public void testNoElseInRetunedExpressionNoMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpressionNoMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpressionNoMatch.kt"); doTest(fileName); } @TestMetadata("noElseInStatement.kt") public void testNoElseInStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInStatement.kt"); doTest(fileName); } @TestMetadata("noElseNoMatch.kt") public void testNoElseNoMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseNoMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseNoMatch.kt"); doTest(fileName); } @TestMetadata("nullableWhen.kt") public void testNullableWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/nullableWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/nullableWhen.kt"); doTest(fileName); } @TestMetadata("range.kt") public void testRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/range.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/range.kt"); doTest(fileName); } @TestMetadata("whenArgumentIsEvaluatedOnlyOnce.kt") public void testWhenArgumentIsEvaluatedOnlyOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java index 9241e625aa3..8061ae8341f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInBoxInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject") @@ -40,102 +40,102 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class AnonymousObject extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInAnonymousObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("anonymousObjectOnCallSite.1.kt") public void testAnonymousObjectOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt") public void testAnonymousObjectOnCallSiteSuperParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnDeclarationSite.1.kt") public void testAnonymousObjectOnDeclarationSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt") public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline.1.kt") public void testCapturedLambdaInInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline2.1.kt") public void testCapturedLambdaInInline2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline3.1.kt") public void testCapturedLambdaInInline3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline3.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline3.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInlineObject.1.kt") public void testCapturedLambdaInInlineObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("changingReturnType.1.kt") public void testChangingReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/changingReturnType.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/changingReturnType.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("constructorVisibility.1.kt") public void testConstructorVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibility.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibility.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("constructorVisibilityInConstLambda.1.kt") public void testConstructorVisibilityInConstLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInConstLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInConstLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("constructorVisibilityInLambda.1.kt") public void testConstructorVisibilityInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt6552.1.kt") public void testKt6552() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt6552.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt6552.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8133.1.kt") public void testKt8133() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt8133.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt8133.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt9064.1.kt") public void testKt9064() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt9064v2.1.kt") public void testKt9064v2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064v2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064v2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -145,54 +145,54 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class ArgumentOrder extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInArgumentOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/argumentOrder"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/argumentOrder"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("captured.1.kt") public void testCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/captured.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/captured.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedInExtension.1.kt") public void testCapturedInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/capturedInExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/capturedInExtension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("extensionInClass.1.kt") public void testExtensionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extensionInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extensionInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaMigration.1.kt") public void testLambdaMigration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigration.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigration.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaMigrationInClass.1.kt") public void testLambdaMigrationInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigrationInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigrationInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simple.1.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simple.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleInClass.1.kt") public void testSimpleInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simpleInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simpleInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -202,18 +202,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Builders extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInBuilders() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("builders.1.kt") public void testBuilders() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("buildersAndLambdaCapturing.1.kt") public void testBuildersAndLambdaCapturing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -223,42 +223,42 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/callableReference"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/callableReference"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("classLevel.1.kt") public void testClassLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("classLevel2.1.kt") public void testClassLevel2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("constructor.1.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/constructor.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/constructor.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intrinsic.1.kt") public void testIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/intrinsic.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/intrinsic.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("topLevel.1.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevel.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevel.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("topLevelExtension.1.kt") public void testTopLevelExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevelExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevelExtension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -268,42 +268,42 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Capture extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInCapture() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("captureInlinable.1.kt") public void testCaptureInlinable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("captureInlinableAndOther.1.kt") public void testCaptureInlinableAndOther() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("captureThisAndReceiver.1.kt") public void testCaptureThisAndReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("generics.1.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleCapturingInClass.1.kt") public void testSimpleCapturingInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleCapturingInPackage.1.kt") public void testSimpleCapturingInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -313,36 +313,36 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Complex extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInComplex() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("closureChain.1.kt") public void testClosureChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("forEachLine.1.kt") public void testForEachLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaInLambda.1.kt") public void testLambdaInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("use.1.kt") public void testUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("with.1.kt") public void testWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -352,48 +352,48 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValues extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInDefaultValues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("defaultInExtension.1.kt") public void testDefaultInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("defaultMethod.1.kt") public void testDefaultMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("defaultMethodInClass.1.kt") public void testDefaultMethodInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("defaultParamRemapping.1.kt") public void testDefaultParamRemapping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("inlineInDefaultParameter.1.kt") public void testInlineInDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt5685.1.kt") public void testKt5685() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/kt5685.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/kt5685.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleDefaultMethod.1.kt") public void testSimpleDefaultMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -403,12 +403,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class FunctionExpression extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInFunctionExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/functionExpression"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/functionExpression"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/functionExpression/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/functionExpression/extension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -418,18 +418,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class LambdaClassClash extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInLambdaClassClash() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaClassClash.1.kt") public void testLambdaClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaX2.1.kt") public void testNoInlineLambdaX2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -439,36 +439,36 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class LambdaTransformation extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInLambdaTransformation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaCloning.1.kt") public void testLambdaCloning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaInLambda2.1.kt") public void testLambdaInLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaInLambdaNoInline.1.kt") public void testLambdaInLambdaNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("regeneratedLambdaName.1.kt") public void testRegeneratedLambdaName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("sameCaptured.1.kt") public void testSameCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -478,12 +478,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class LocalFunInLambda extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInLocalFunInLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("localFunInLambda.1.kt") public void testLocalFunInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -493,18 +493,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInModifiers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/modifiers"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/modifiers"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("packagePrivateMembers.1.kt") public void testPackagePrivateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("propertyModifiers.1.kt") public void testPropertyModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/propertyModifiers.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/propertyModifiers.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -514,12 +514,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClasses extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInMultifileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/multifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/multifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("inlineFromOtherPackage.1.kt") public void testInlineFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/multifileClasses/inlineFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/multifileClasses/inlineFromOtherPackage.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -529,42 +529,42 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class NoInline extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInNoInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaAsGeneric.1.kt") public void testLambdaAsGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsGeneric.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsGeneric.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaAsNonFunction.1.kt") public void testLambdaAsNonFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsNonFunction.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsNonFunction.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noInline.1.kt") public void testNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaChain.1.kt") public void testNoInlineLambdaChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt") public void testNoInlineLambdaChainWithCapturedInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("withoutInline.1.kt") public void testWithoutInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -574,84 +574,84 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("explicitLocalReturn.1.kt") public void testExplicitLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("justReturnInLambda.1.kt") public void testJustReturnInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt5199.1.kt") public void testKt5199() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt5199.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt5199.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8948.1.kt") public void testKt8948() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8948v2.1.kt") public void testKt8948v2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948v2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948v2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nestedNonLocals.1.kt") public void testNestedNonLocals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noInlineLocalReturn.1.kt") public void testNoInlineLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nonLocalReturnFromOuterLambda.1.kt") public void testNonLocalReturnFromOuterLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nonLocalReturnFromOuterLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nonLocalReturnFromOuterLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("propertyAccessors.1.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("returnFromFunctionExpr.1.kt") public void testReturnFromFunctionExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/returnFromFunctionExpr.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/returnFromFunctionExpr.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simple.1.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleFunctional.1.kt") public void testSimpleFunctional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleFunctional.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleFunctional.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleVoid.1.kt") public void testSimpleVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @@ -660,18 +660,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Deparenthesize extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInDeparenthesize() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("bracket.1.kt") public void testBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("labeled.1.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -681,24 +681,24 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInTryFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt6956.1.kt") public void testKt6956() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt7273.1.kt") public void testKt7273() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt7273.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt7273.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nonLocalReturnFromOuterLambda.1.kt") public void testNonLocalReturnFromOuterLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @@ -707,42 +707,42 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class CallSite extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInCallSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("callSite.1.kt") public void testCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("callSiteComplex.1.kt") public void testCallSiteComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("exceptionTableSplit.1.kt") public void testExceptionTableSplit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("exceptionTableSplitNoReturn.1.kt") public void testExceptionTableSplitNoReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("finallyInFinally.1.kt") public void testFinallyInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/finallyInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/finallyInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("wrongVarInterval.1.kt") public void testWrongVarInterval() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/wrongVarInterval.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/wrongVarInterval.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -752,54 +752,54 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Chained extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInChained() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("finallyInFinally.1.kt") public void testFinallyInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("finallyInFinally2.1.kt") public void testFinallyInFinally2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturn.1.kt") public void testIntReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturnComplex.1.kt") public void testIntReturnComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturnComplex2.1.kt") public void testIntReturnComplex2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturnComplex3.1.kt") public void testIntReturnComplex3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturnComplex4.1.kt") public void testIntReturnComplex4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nestedLambda.1.kt") public void testNestedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/nestedLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/nestedLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -809,78 +809,78 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class DeclSite extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInDeclSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("complex.1.kt") public void testComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturn.1.kt") public void testIntReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("intReturnComplex.1.kt") public void testIntReturnComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("longReturn.1.kt") public void testLongReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nested.1.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/nested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/nested.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("returnInFinally.1.kt") public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("returnInTry.1.kt") public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTry.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTry.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("returnInTryAndFinally.1.kt") public void testReturnInTryAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTryAndFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTryAndFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("severalInTry.1.kt") public void testSeveralInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTry.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTry.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("severalInTryComplex.1.kt") public void testSeveralInTryComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTryComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTryComplex.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("voidInlineFun.1.kt") public void testVoidInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidInlineFun.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidInlineFun.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("voidNonLocal.1.kt") public void testVoidNonLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidNonLocal.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidNonLocal.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -890,102 +890,102 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class ExceptionTable extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInExceptionTable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("break.1.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/break.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/break.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("continue.1.kt") public void testContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/continue.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/continue.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("exceptionInFinally.1.kt") public void testExceptionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("forInFinally.1.kt") public void testForInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/forInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/forInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("innerAndExternal.1.kt") public void testInnerAndExternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("innerAndExternalNested.1.kt") public void testInnerAndExternalNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("innerAndExternalSimple.1.kt") public void testInnerAndExternalSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nested.1.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nestedWithReturns.1.kt") public void testNestedWithReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("nestedWithReturnsSimple.1.kt") public void testNestedWithReturnsSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("noFinally.1.kt") public void testNoFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("severalCatchClause.1.kt") public void testSeveralCatchClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleThrow.1.kt") public void testSimpleThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("synchonized.1.kt") public void testSynchonized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/synchonized.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/synchonized.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("throwInFinally.1.kt") public void testThrowInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("tryCatchInFinally.1.kt") public void testTryCatchInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -995,12 +995,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt7792.1.kt") public void testKt7792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1013,47 +1013,47 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo public static class Private extends AbstractBlackBoxInlineCodegenTest { @TestMetadata("accessorStability.1.kt") public void testAccessorStability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("accessorStabilityInClass.1.kt") public void testAccessorStabilityInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStabilityInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStabilityInClass.1.kt"); doTestMultiFileWithInlineCheck(fileName); } public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/private"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/private"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt6453.1.kt") public void testKt6453() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt6453.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt6453.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8094.1.kt") public void testKt8094() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8094.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8094.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8095.1.kt") public void testKt8095() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8095.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8095.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("privateInInlineInMultiFileFacade.1.kt") public void testPrivateInInlineInMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInInlineInMultiFileFacade.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInInlineInMultiFileFacade.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("privateInline.1.kt") public void testPrivateInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInline.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1063,66 +1063,66 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Reified extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInReified() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/reified"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/reified"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("capturedLambda.1.kt") public void testCapturedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("capturedLambda2.1.kt") public void testCapturedLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt6988.1.kt") public void testKt6988() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt6988_2.1.kt") public void testKt6988_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988_2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988_2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt6990.1.kt") public void testKt6990() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6990.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6990.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt7017.1.kt") public void testKt7017() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt7017.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt7017.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt8047.1.kt") public void testKt8047() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt8047.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt8047.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt9637.1.kt") public void testKt9637() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("kt9637_2.1.kt") public void testKt9637_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637_2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637_2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("packages.1.kt") public void testPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/packages.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/packages.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1132,90 +1132,90 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Simple extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInSimple() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("classObject.1.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("extensionLambda.1.kt") public void testExtensionLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extensionLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extensionLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("params.1.kt") public void testParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("rootConstructor.1.kt") public void testRootConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("severalClosures.1.kt") public void testSeveralClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("severalUsage.1.kt") public void testSeveralUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleDouble.1.kt") public void testSimpleDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleEnum.1.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleGenerics.1.kt") public void testSimpleGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleInt.1.kt") public void testSimpleInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleLambda.1.kt") public void testSimpleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("simpleObject.1.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("vararg.1.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1225,24 +1225,24 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Smap extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInSmap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("assertion.1.kt") public void testAssertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/assertion.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/assertion.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("oneFile.1.kt") public void testOneFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/oneFile.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/oneFile.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("smap.1.kt") public void testSmap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/smap.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/smap.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @@ -1251,54 +1251,54 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Anonymous extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInAnonymous() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/anonymous"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/anonymous"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambda.1.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaOnCallSite.1.kt") public void testLambdaOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("lambdaOnInlineCallSite.1.kt") public void testLambdaOnInlineCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("object.1.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("objectOnCallSite.1.kt") public void testObjectOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSite.1.kt") public void testObjectOnInlineCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSite2.1.kt") public void testObjectOnInlineCallSite2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSiteWithCapture.1.kt") public void testObjectOnInlineCallSiteWithCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1308,18 +1308,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Resolve extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/resolve"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/resolve"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("inlineComponent.1.kt") public void testInlineComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("inlineIterator.1.kt") public void testInlineIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1330,42 +1330,42 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Special extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInSpecial() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("identityCheck.1.kt") public void testIdentityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("ifBranches.1.kt") public void testIfBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("iinc.1.kt") public void testIinc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("inlineChain.1.kt") public void testInlineChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("plusAssign.1.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("stackHeightBug.1.kt") public void testStackHeightBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1375,12 +1375,12 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class Trait extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("trait.1.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } @@ -1390,30 +1390,30 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @RunWith(JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt5863.1.kt") public void testKt5863() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/kt5863.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/kt5863.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("tryCatch.1.kt") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("tryCatch2.1.kt") public void testTryCatch2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt"); doTestMultiFileWithInlineCheck(fileName); } @TestMetadata("tryCatchFinally.1.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt"); doTestMultiFileWithInlineCheck(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index e3dc6dca471..ee144771fb4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,113 +33,113 @@ import java.util.regex.Pattern; public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorForProtected") public void testAccessorForProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtected/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtected/"); doTestMultiFile(fileName); } @TestMetadata("accessorForProtectedInvokeVirtual") public void testAccessorForProtectedInvokeVirtual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtectedInvokeVirtual/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtectedInvokeVirtual/"); doTestMultiFile(fileName); } public void testAllFilesPresentInBoxMultiFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultiFile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultiFile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("callMultifileClassMemberFromOtherPackage") public void testCallMultifileClassMemberFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/callMultifileClassMemberFromOtherPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/callMultifileClassMemberFromOtherPackage/"); doTestMultiFile(fileName); } @TestMetadata("inlineMultifileClassMemberFromOtherPackage") public void testInlineMultifileClassMemberFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/inlineMultifileClassMemberFromOtherPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/inlineMultifileClassMemberFromOtherPackage/"); doTestMultiFile(fileName); } @TestMetadata("internalVisibility") public void testInternalVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/internalVisibility/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/internalVisibility/"); doTestMultiFile(fileName); } @TestMetadata("kt1515") public void testKt1515() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1515/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1515/"); doTestMultiFile(fileName); } @TestMetadata("kt1528") public void testKt1528() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1528/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1528/"); doTestMultiFile(fileName); } @TestMetadata("kt1845") public void testKt1845() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1845/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1845/"); doTestMultiFile(fileName); } @TestMetadata("kt2060") public void testKt2060() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2060/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2060/"); doTestMultiFile(fileName); } @TestMetadata("kt9717") public void testKt9717() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717/"); doTestMultiFile(fileName); } @TestMetadata("kt9717DifferentPackages") public void testKt9717DifferentPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717DifferentPackages/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt9717DifferentPackages/"); doTestMultiFile(fileName); } @TestMetadata("mainInFiles") public void testMainInFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/mainInFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/mainInFiles/"); doTestMultiFile(fileName); } @TestMetadata("multifileClassPartsInitialization") public void testMultifileClassPartsInitialization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/multifileClassPartsInitialization/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/multifileClassPartsInitialization/"); doTestMultiFile(fileName); } @TestMetadata("packageLocalClassNotImportedWithDefaultImport") public void testPackageLocalClassNotImportedWithDefaultImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/packageLocalClassNotImportedWithDefaultImport/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/packageLocalClassNotImportedWithDefaultImport/"); doTestMultiFile(fileName); } @TestMetadata("samWrappersDifferentFiles") public void testSamWrappersDifferentFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/"); doTestMultiFile(fileName); } @TestMetadata("sameFileName") public void testSameFileName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/sameFileName/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/sameFileName/"); doTestMultiFile(fileName); } @TestMetadata("samePartNameDifferentFacades") public void testSamePartNameDifferentFacades() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samePartNameDifferentFacades/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samePartNameDifferentFacades/"); doTestMultiFile(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/simple/"); doTestMultiFile(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 5955b5f9627..6b642d8bf85 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotatedSamFunExpression") public void testAnnotatedSamFunExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamFunExpression/"); doTestWithJava(fileName); } @TestMetadata("annotatedSamLambda") public void testAnnotatedSamLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamLambda/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedSamLambda/"); doTestWithJava(fileName); } @TestMetadata("classCompanion") public void testClassCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/classCompanion/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/classCompanion/"); doTestWithJava(fileName); } @TestMetadata("classObjectAccessor") public void testClassObjectAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/classObjectAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/classObjectAccessor/"); doTestWithJava(fileName); } @TestMetadata("deprecatedFieldForObject") public void testDeprecatedFieldForObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/deprecatedFieldForObject/"); doTestWithJava(fileName); } @TestMetadata("inline") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/inline/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/inline/"); doTestWithJava(fileName); } @TestMetadata("innerClass") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/innerClass/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/innerClass/"); doTestWithJava(fileName); } @TestMetadata("interfaceCompanion") public void testInterfaceCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceCompanion/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceCompanion/"); doTestWithJava(fileName); } @TestMetadata("interfaceDefaultImpls") public void testInterfaceDefaultImpls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceDefaultImpls/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaceDefaultImpls/"); doTestWithJava(fileName); } @TestMetadata("jvmName") public void testJvmName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmName/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmName/"); doTestWithJava(fileName); } @TestMetadata("mangling") public void testMangling() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/mangling/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/mangling/"); doTestWithJava(fileName); } @TestMetadata("number") public void testNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/number/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/number/"); doTestWithJava(fileName); } @TestMetadata("protectedInInline") public void testProtectedInInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/protectedInInline/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/protectedInInline/"); doTestWithJava(fileName); } @@ -118,12 +118,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class AnnotatedFileClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotatedFileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/annotatedFileClasses"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/annotatedFileClasses"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("javaAnnotationOnFileFacade") public void testJavaAnnotationOnFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedFileClasses/javaAnnotationOnFileFacade/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotatedFileClasses/javaAnnotationOnFileFacade/"); doTestWithJava(fileName); } @@ -134,24 +134,24 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationsWithKClass extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotationsWithKClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/annotationsWithKClass"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/annotationsWithKClass"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("array") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/array/"); doTestWithJava(fileName); } @TestMetadata("basic") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/basic/"); doTestWithJava(fileName); } @TestMetadata("vararg") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/annotationsWithKClass/vararg/"); doTestWithJava(fileName); } @@ -162,24 +162,24 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBuiltinStubMethods() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/builtinStubMethods"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/builtinStubMethods"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("extendJavaCollections") public void testExtendJavaCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/extendJavaCollections/"); doTestWithJava(fileName); } @TestMetadata("substitutedIterable") public void testSubstitutedIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedIterable/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedIterable/"); doTestWithJava(fileName); } @TestMetadata("substitutedList") public void testSubstitutedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedList/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods/substitutedList/"); doTestWithJava(fileName); } @@ -190,12 +190,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/casts"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/casts"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("javaTypeIsFunK") public void testJavaTypeIsFunK() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/casts/javaTypeIsFunK/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/casts/javaTypeIsFunK/"); doTestWithJava(fileName); } @@ -206,84 +206,84 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class Collections extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/collections"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/collections"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("charSequence") public void testCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/charSequence/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/charSequence/"); doTestWithJava(fileName); } @TestMetadata("implementCollectionThroughKotlin") public void testImplementCollectionThroughKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/implementCollectionThroughKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/implementCollectionThroughKotlin/"); doTestWithJava(fileName); } @TestMetadata("irrelevantImplCharSequence") public void testIrrelevantImplCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequence/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequence/"); doTestWithJava(fileName); } @TestMetadata("irrelevantImplCharSequenceKotlin") public void testIrrelevantImplCharSequenceKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequenceKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplCharSequenceKotlin/"); doTestWithJava(fileName); } @TestMetadata("irrelevantImplMutableList") public void testIrrelevantImplMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableList/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableList/"); doTestWithJava(fileName); } @TestMetadata("irrelevantImplMutableListKotlin") public void testIrrelevantImplMutableListKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListKotlin/"); doTestWithJava(fileName); } @TestMetadata("irrelevantImplMutableListSubstitution") public void testIrrelevantImplMutableListSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListSubstitution/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantImplMutableListSubstitution/"); doTestWithJava(fileName); } @TestMetadata("irrelevantRemoveAtOverrideInJava") public void testIrrelevantRemoveAtOverrideInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantRemoveAtOverrideInJava/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantRemoveAtOverrideInJava/"); doTestWithJava(fileName); } @TestMetadata("irrelevantSizeOverrideInJava") public void testIrrelevantSizeOverrideInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantSizeOverrideInJava/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/irrelevantSizeOverrideInJava/"); doTestWithJava(fileName); } @TestMetadata("mutableList") public void testMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/mutableList/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/mutableList/"); doTestWithJava(fileName); } @TestMetadata("platformValueContains") public void testPlatformValueContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/platformValueContains/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/platformValueContains/"); doTestWithJava(fileName); } @TestMetadata("removeAtInt") public void testRemoveAtInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/removeAtInt/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/removeAtInt/"); doTestWithJava(fileName); } @TestMetadata("strList") public void testStrList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/strList/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/collections/strList/"); doTestWithJava(fileName); } @@ -294,36 +294,36 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class FileClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/fileClasses"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/fileClasses"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("differentFiles") public void testDifferentFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/differentFiles/"); doTestWithJava(fileName); } @TestMetadata("multifileClassWith2Files") public void testMultifileClassWith2Files() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWith2Files/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWith2Files/"); doTestWithJava(fileName); } @TestMetadata("multifileClassWithCrossCall") public void testMultifileClassWithCrossCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithCrossCall/"); doTestWithJava(fileName); } @TestMetadata("multifileClassWithPrivate") public void testMultifileClassWithPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithPrivate/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/multifileClassWithPrivate/"); doTestWithJava(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/fileClasses/simple/"); doTestWithJava(fileName); } @@ -335,17 +335,17 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege public static class Interfaces extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClassInheritsFromInterface") public void testAbstractClassInheritsFromInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/abstractClassInheritsFromInterface/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/abstractClassInheritsFromInterface/"); doTestWithJava(fileName); } public void testAllFilesPresentInInterfaces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/interfaces"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/interfaces"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("inheritJavaInterface") public void testInheritJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/inheritJavaInterface/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/interfaces/inheritJavaInterface/"); doTestWithJava(fileName); } @@ -356,12 +356,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class JvmField extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmField"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmField"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmField/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmField/simple/"); doTestWithJava(fileName); } @@ -372,18 +372,18 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class JvmOverloads extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmOverloads() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmOverloads"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmOverloads"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("generics") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/generics/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/generics/"); doTestWithJava(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads/simple/"); doTestWithJava(fileName); } @@ -394,30 +394,30 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class JvmStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmStatic"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/jvmStatic"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/annotations/"); doTestWithJava(fileName); } @TestMetadata("classObject") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/classObject/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/classObject/"); doTestWithJava(fileName); } @TestMetadata("enumCompanion") public void testEnumCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/enumCompanion/"); doTestWithJava(fileName); } @TestMetadata("object") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/object/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/jvmStatic/object/"); doTestWithJava(fileName); } @@ -428,12 +428,12 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class NotNullAssertions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNotNullAssertions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/notNullAssertions"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/notNullAssertions"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("extensionReceiverParameter") public void testExtensionReceiverParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions/extensionReceiverParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions/extensionReceiverParameter/"); doTestWithJava(fileName); } @@ -444,42 +444,42 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/properties"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/properties"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotationWithKotlinProperty") public void testAnnotationWithKotlinProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinProperty/"); doTestWithJava(fileName); } @TestMetadata("annotationWithKotlinPropertyFromInterfaceCompanion") public void testAnnotationWithKotlinPropertyFromInterfaceCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/annotationWithKotlinPropertyFromInterfaceCompanion/"); doTestWithJava(fileName); } @TestMetadata("classObjectProperties") public void testClassObjectProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/classObjectProperties/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/classObjectProperties/"); doTestWithJava(fileName); } @TestMetadata("collectionSize") public void testCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/collectionSize/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/collectionSize/"); doTestWithJava(fileName); } @TestMetadata("commonProperties") public void testCommonProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/commonProperties/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/commonProperties/"); doTestWithJava(fileName); } @TestMetadata("substituteJavaSuperField") public void testSubstituteJavaSuperField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/properties/substituteJavaSuperField/"); doTestWithJava(fileName); } @@ -490,120 +490,120 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/reflection"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/reflection"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("callInstanceJavaMethod") public void testCallInstanceJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callInstanceJavaMethod/"); doTestWithJava(fileName); } @TestMetadata("callPrivateJavaMethod") public void testCallPrivateJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callPrivateJavaMethod/"); doTestWithJava(fileName); } @TestMetadata("callStaticJavaMethod") public void testCallStaticJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/callStaticJavaMethod/"); doTestWithJava(fileName); } @TestMetadata("declaredVsInheritedFunctions") public void testDeclaredVsInheritedFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedFunctions/"); doTestWithJava(fileName); } @TestMetadata("declaredVsInheritedProperties") public void testDeclaredVsInheritedProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedProperties/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/declaredVsInheritedProperties/"); doTestWithJava(fileName); } @TestMetadata("functionReferenceErasedToKFunction") public void testFunctionReferenceErasedToKFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/functionReferenceErasedToKFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/functionReferenceErasedToKFunction/"); doTestWithJava(fileName); } @TestMetadata("javaClassGetFunctions") public void testJavaClassGetFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaClassGetFunctions/"); doTestWithJava(fileName); } @TestMetadata("javaMethodsSmokeTest") public void testJavaMethodsSmokeTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaMethodsSmokeTest/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaMethodsSmokeTest/"); doTestWithJava(fileName); } @TestMetadata("javaPropertyInheritedInKotlin") public void testJavaPropertyInheritedInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaPropertyInheritedInKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaPropertyInheritedInKotlin/"); doTestWithJava(fileName); } @TestMetadata("javaStaticField") public void testJavaStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaStaticField/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/javaStaticField/"); doTestWithJava(fileName); } @TestMetadata("kotlinPropertyInheritedInJava") public void testKotlinPropertyInheritedInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/"); doTestWithJava(fileName); } @TestMetadata("mutatePrivateJavaInstanceField") public void testMutatePrivateJavaInstanceField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaInstanceField/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaInstanceField/"); doTestWithJava(fileName); } @TestMetadata("mutatePrivateJavaStaticField") public void testMutatePrivateJavaStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaStaticField/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/mutatePrivateJavaStaticField/"); doTestWithJava(fileName); } @TestMetadata("nestedClasses") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/nestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/nestedClasses/"); doTestWithJava(fileName); } @TestMetadata("noConflictOnKotlinGetterAndJavaField") public void testNoConflictOnKotlinGetterAndJavaField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/noConflictOnKotlinGetterAndJavaField/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/noConflictOnKotlinGetterAndJavaField/"); doTestWithJava(fileName); } @TestMetadata("parametersHaveNoNames") public void testParametersHaveNoNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/parametersHaveNoNames/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/parametersHaveNoNames/"); doTestWithJava(fileName); } @TestMetadata("platformTypeNotEqualToKotlinType") public void testPlatformTypeNotEqualToKotlinType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeNotEqualToKotlinType/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeNotEqualToKotlinType/"); doTestWithJava(fileName); } @TestMetadata("platformTypeToString") public void testPlatformTypeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/"); doTestWithJava(fileName); } @TestMetadata("referenceToJavaFieldOfKotlinSubclass") public void testReferenceToJavaFieldOfKotlinSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/referenceToJavaFieldOfKotlinSubclass/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/reflection/referenceToJavaFieldOfKotlinSubclass/"); doTestWithJava(fileName); } @@ -614,30 +614,30 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/secondaryConstructors"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/secondaryConstructors"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("withGenerics") public void testWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withGenerics/"); doTestWithJava(fileName); } @TestMetadata("withPrimary") public void testWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withPrimary/"); doTestWithJava(fileName); } @TestMetadata("withVarargs") public void testWithVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withVarargs/"); doTestWithJava(fileName); } @TestMetadata("withoutPrimary") public void testWithoutPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors/withoutPrimary/"); doTestWithJava(fileName); } @@ -648,42 +648,42 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @RunWith(JUnit3RunnerWithInners.class) public static class Statics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStatics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/statics"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava/statics"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("fields") public void testFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/fields/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/fields/"); doTestWithJava(fileName); } @TestMetadata("functions") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/functions/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/functions/"); doTestWithJava(fileName); } @TestMetadata("hidePrivateByPublic") public void testHidePrivateByPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/hidePrivateByPublic/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/hidePrivateByPublic/"); doTestWithJava(fileName); } @TestMetadata("protectedSamConstructor") public void testProtectedSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedSamConstructor/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedSamConstructor/"); doTestWithJava(fileName); } @TestMetadata("protectedStatic") public void testProtectedStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic/"); doTestWithJava(fileName); } @TestMetadata("protectedStatic2") public void testProtectedStatic2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic2/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/statics/protectedStatic2/"); doTestWithJava(fileName); } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 5063e1cdf55..7753cd68f01 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithStdlib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxWithStdlib/againstMultifileStdlib") @@ -40,12 +40,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class AgainstMultifileStdlib extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAgainstMultifileStdlib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/againstMultifileStdlib"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/againstMultifileStdlib"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("useStdlib.kt") public void testUseStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/againstMultifileStdlib/useStdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/againstMultifileStdlib/useStdlib.kt"); doTestWithStdlib(fileName); } } @@ -55,78 +55,78 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotatedEnumEntry.kt") public void testAnnotatedEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt"); doTestWithStdlib(fileName); } @TestMetadata("annotationsOnDefault.kt") public void testAnnotationsOnDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt"); doTestWithStdlib(fileName); } @TestMetadata("defaultParameterValues.kt") public void testDefaultParameterValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt"); doTestWithStdlib(fileName); } @TestMetadata("delegatedPropertySetter.kt") public void testDelegatedPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt"); doTestWithStdlib(fileName); } @TestMetadata("fileClassWithFileAnnotation.kt") public void testFileClassWithFileAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/fileClassWithFileAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/fileClassWithFileAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("kotlinPropertyFromClassObjectAsParameter.kt") public void testKotlinPropertyFromClassObjectAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("kotlinTopLevelPropertyAsParameter.kt") public void testKotlinTopLevelPropertyAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedClassPropertyAsParameter.kt") public void testNestedClassPropertyAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("parameterWithPrimitiveType.kt") public void testParameterWithPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt") public void testPropertyWithPropertyInInitializerAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("resolveWithLowPriorityAnnotation.kt") public void testResolveWithLowPriorityAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/resolveWithLowPriorityAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/resolveWithLowPriorityAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("varargInAnnotationParameter.kt") public void testVarargInAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt"); doTestWithStdlib(fileName); } @@ -135,18 +135,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class AnnotatedLambda extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotatedLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funExpression.kt") public void testFunExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/lambda.kt"); doTestWithStdlib(fileName); } } @@ -157,138 +157,138 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Arrays extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArrays() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/arrays"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayConstructorsSimple.kt") public void testArrayConstructorsSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayConstructorsSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayConstructorsSimple.kt"); doTestWithStdlib(fileName); } @TestMetadata("arrayGetAssignMultiIndex.kt") public void testArrayGetAssignMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetAssignMultiIndex.kt"); doTestWithStdlib(fileName); } @TestMetadata("arrayGetMultiIndex.kt") public void testArrayGetMultiIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/arrayGetMultiIndex.kt"); doTestWithStdlib(fileName); } @TestMetadata("cloneArray.kt") public void testCloneArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("clonePrimitiveArrays.kt") public void testClonePrimitiveArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt"); doTestWithStdlib(fileName); } @TestMetadata("inProjectionAsParameter.kt") public void testInProjectionAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionAsParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("inProjectionOfArray.kt") public void testInProjectionOfArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("inProjectionOfList.kt") public void testInProjectionOfList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/inProjectionOfList.kt"); doTestWithStdlib(fileName); } @TestMetadata("indices.kt") public void testIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/indices.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/indices.kt"); doTestWithStdlib(fileName); } @TestMetadata("indicesChar.kt") public void testIndicesChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/indicesChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/indicesChar.kt"); doTestWithStdlib(fileName); } @TestMetadata("iterator.kt") public void testIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/iterator.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1291.kt") public void testKt1291() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt1291.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3771.kt") public void testKt3771() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt4118.kt") public void testKt4118() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4118.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt4357.kt") public void testKt4357() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt4357.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt602.kt") public void testKt602() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt602.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt602.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt7009.kt") public void testKt7009() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt7009.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt7338.kt") public void testKt7338() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt7338.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt945.kt") public void testKt945() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt945.kt"); doTestWithStdlib(fileName); } @TestMetadata("multiArrayConstructors.kt") public void testMultiArrayConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/multiArrayConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/multiArrayConstructors.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonNullArray.kt") public void testNonNullArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/nonNullArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("stdlib.kt") public void testStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/stdlib.kt"); doTestWithStdlib(fileName); } } @@ -298,84 +298,84 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class BoxingOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxingOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/casts.kt"); doTestWithStdlib(fileName); } @TestMetadata("checkcastAndInstanceOf.kt") public void testCheckcastAndInstanceOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/checkcastAndInstanceOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/checkcastAndInstanceOf.kt"); doTestWithStdlib(fileName); } @TestMetadata("fold.kt") public void testFold() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/fold.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/fold.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5493.kt") public void testKt5493() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5588.kt") public void testKt5588() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5844.kt") public void testKt5844() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5844.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5844.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6047.kt") public void testKt6047() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt6047.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt6047.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullCheck.kt") public void testNullCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/nullCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/nullCheck.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressions.kt") public void testProgressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeCallWithElvis.kt") public void testSafeCallWithElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/safeCallWithElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/safeCallWithElvis.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/simple.kt"); doTestWithStdlib(fileName); } @TestMetadata("unsafeRemoving.kt") public void testUnsafeRemoving() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/unsafeRemoving.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/unsafeRemoving.kt"); doTestWithStdlib(fileName); } @TestMetadata("variables.kt") public void testVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/variables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/variables.kt"); doTestWithStdlib(fileName); } } @@ -385,7 +385,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function") @@ -394,257 +394,257 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode public static class Function extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClassMember.kt") public void testAbstractClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt"); doTestWithStdlib(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("booleanNotIntrinsic.kt") public void testBooleanNotIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromClass.kt") public void testClassMemberFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromExtension.kt") public void testClassMemberFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromTopLevelStringNoArgs.kt") public void testClassMemberFromTopLevelStringNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt") public void testClassMemberFromTopLevelStringOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt") public void testClassMemberFromTopLevelUnitNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt") public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructorFromTopLevelNoArgs.kt") public void testConstructorFromTopLevelNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructorFromTopLevelOneStringArg.kt") public void testConstructorFromTopLevelOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("enumValueOfMethod.kt") public void testEnumValueOfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumValueOfMethod.kt"); doTestWithStdlib(fileName); } @TestMetadata("equalsIntrinsic.kt") public void testEqualsIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromClass.kt") public void testExtensionFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromExtension.kt") public void testExtensionFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromTopLevelStringNoArgs.kt") public void testExtensionFromTopLevelStringNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromTopLevelStringOneStringArg.kt") public void testExtensionFromTopLevelStringOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromTopLevelUnitNoArgs.kt") public void testExtensionFromTopLevelUnitNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt") public void testExtensionFromTopLevelUnitOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericMember.kt") public void testGenericMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("getArityViaFunctionImpl.kt") public void testGetArityViaFunctionImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/getArityViaFunctionImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/getArityViaFunctionImpl.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerConstructorFromClass.kt") public void testInnerConstructorFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerConstructorFromExtension.kt") public void testInnerConstructorFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerConstructorFromTopLevelNoArgs.kt") public void testInnerConstructorFromTopLevelNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt") public void testInnerConstructorFromTopLevelOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("javaCollectionsStaticMethod.kt") public void testJavaCollectionsStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/javaCollectionsStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/javaCollectionsStaticMethod.kt"); doTestWithStdlib(fileName); } @TestMetadata("listOfStringsMapLength.kt") public void testListOfStringsMapLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/listOfStringsMapLength.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/listOfStringsMapLength.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedConstructorFromClass.kt") public void testNestedConstructorFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt") public void testNestedConstructorFromTopLevelNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt") public void testNestedConstructorFromTopLevelOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("newArray.kt") public void testNewArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("overloadedFun.kt") public void testOverloadedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFun.kt"); doTestWithStdlib(fileName); } @TestMetadata("overloadedFunVsVal.kt") public void testOverloadedFunVsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/overloadedFunVsVal.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateClassMember.kt") public void testPrivateClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("sortListOfStrings.kt") public void testSortListOfStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromClass.kt") public void testTopLevelFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromExtension.kt") public void testTopLevelFromExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromTopLevelStringNoArgs.kt") public void testTopLevelFromTopLevelStringNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt") public void testTopLevelFromTopLevelStringOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt") public void testTopLevelFromTopLevelUnitNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt") public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("traitImplMethodWithClassReceiver.kt") public void testTraitImplMethodWithClassReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt"); doTestWithStdlib(fileName); } @TestMetadata("traitMember.kt") public void testTraitMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt"); doTestWithStdlib(fileName); } @@ -653,114 +653,114 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Local extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("captureOuter.kt") public void testCaptureOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMember.kt") public void testClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("closureWithSideEffect.kt") public void testClosureWithSideEffect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructorWithInitializer.kt") public void testConstructorWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt"); doTestWithStdlib(fileName); } @TestMetadata("enumExtendsTrait.kt") public void testEnumExtendsTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt"); doTestWithStdlib(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionToLocalClass.kt") public void testExtensionToLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionToPrimitive.kt") public void testExtensionToPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionWithClosure.kt") public void testExtensionWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericMember.kt") public void testGenericMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("localClassMember.kt") public void testLocalClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("localLocal.kt") public void testLocalLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt"); doTestWithStdlib(fileName); } @TestMetadata("recursiveClosure.kt") public void testRecursiveClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleClosure.kt") public void testSimpleClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleWithArg.kt") public void testSimpleWithArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt"); doTestWithStdlib(fileName); } @TestMetadata("unitWithSideEffect.kt") public void testUnitWithSideEffect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt"); doTestWithStdlib(fileName); } } @@ -772,119 +772,119 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode public static class Property extends AbstractBlackBoxCodegenTest { @TestMetadata("accessViaSubclass.kt") public void testAccessViaSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt"); doTestWithStdlib(fileName); } public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegated.kt") public void testDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt"); doTestWithStdlib(fileName); } @TestMetadata("delegatedMutable.kt") public void testDelegatedMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("enumNameOrdinal.kt") public void testEnumNameOrdinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/enumNameOrdinal.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionToArray.kt") public void testExtensionToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/extensionToArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/genericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/genericProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("javaBeanConvention.kt") public void testJavaBeanConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt"); doTestWithStdlib(fileName); } @TestMetadata("kClassInstanceIsInitializedFirst.kt") public void testKClassInstanceIsInitializedFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6870_privatePropertyReference.kt") public void testKt6870_privatePropertyReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kt6870_privatePropertyReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kt6870_privatePropertyReference.kt"); doTestWithStdlib(fileName); } @TestMetadata("localClassVar.kt") public void testLocalClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt"); doTestWithStdlib(fileName); } @TestMetadata("overriddenInSubclass.kt") public void testOverriddenInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformNamedAccessors.kt") public void testPlatformNamedAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/platformNamedAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("publicClassValAccessible.kt") public void testPublicClassValAccessible() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleExtension.kt") public void testSimpleExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMember.kt") public void testSimpleMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMutableExtension.kt") public void testSimpleMutableExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMutableMember.kt") public void testSimpleMutableMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMutableTopLevel.kt") public void testSimpleMutableTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleTopLevel.kt") public void testSimpleTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt"); doTestWithStdlib(fileName); } } @@ -895,132 +895,132 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/casts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/casts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("asFunKBig.kt") public void testAsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("asFunKSmall.kt") public void testAsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("asWithGeneric.kt") public void testAsWithGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt"); doTestWithStdlib(fileName); } @TestMetadata("asWithMutable.kt") public void testAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("isFunKBig.kt") public void testIsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("isFunKSmall.kt") public void testIsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("isWithMutable.kt") public void testIsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/isWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedAsFunKBig.kt") public void testReifiedAsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedAsFunKSmall.kt") public void testReifiedAsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedAsWithMutable.kt") public void testReifiedAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedAsWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedIsFunKBig.kt") public void testReifiedIsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedIsFunKSmall.kt") public void testReifiedIsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedIsWithMutable.kt") public void testReifiedIsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedIsWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedSafeAsFunKBig.kt") public void testReifiedSafeAsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedSafeAsFunKSmall.kt") public void testReifiedSafeAsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedSafeAsWithMutable.kt") public void testReifiedSafeAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/reifiedSafeAsWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeAsFunKBig.kt") public void testSafeAsFunKBig() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsFunKBig.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsFunKBig.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeAsFunKSmall.kt") public void testSafeAsFunKSmall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsFunKSmall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsFunKSmall.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeAsWithMutable.kt") public void testSafeAsWithMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/safeAsWithMutable.kt"); doTestWithStdlib(fileName); } @TestMetadata("unitAsInt.kt") public void testUnitAsInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/unitAsInt.kt"); doTestWithStdlib(fileName); } @TestMetadata("weirdMutableCasts.kt") public void testWeirdMutableCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/weirdMutableCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/weirdMutableCasts.kt"); doTestWithStdlib(fileName); } } @@ -1030,30 +1030,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt471.kt") public void testKt471() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt471.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt471.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt633.kt") public void testKt633() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt633.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt633.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt8011.kt") public void testKt8011() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt8011.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/kt8011.kt"); doTestWithStdlib(fileName); } @TestMetadata("mutabilityMarkerInterfaces.kt") public void testMutabilityMarkerInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/mutabilityMarkerInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/classes/mutabilityMarkerInterfaces.kt"); doTestWithStdlib(fileName); } } @@ -1063,12 +1063,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Const extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConst() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/const"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/const"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("interfaceCompanion.kt") public void testInterfaceCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/const/interfaceCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/const/interfaceCompanion.kt"); doTestWithStdlib(fileName); } } @@ -1078,12 +1078,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("continueInExpr.kt") public void testContinueInExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/controlStructures/continueInExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/controlStructures/continueInExpr.kt"); doTestWithStdlib(fileName); } } @@ -1093,84 +1093,84 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class DataClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDataClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayParams.kt") public void testArrayParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("changingVarParam.kt") public void testChangingVarParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("doubleParam.kt") public void testDoubleParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/doubleParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("floatParam.kt") public void testFloatParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/floatParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericParam.kt") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5002.kt") public void testKt5002() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt"); doTestWithStdlib(fileName); } @TestMetadata("mixedParams.kt") public void testMixedParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt"); doTestWithStdlib(fileName); } @TestMetadata("multiDeclarationFor.kt") public void testMultiDeclarationFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateValParams.kt") public void testPrivateValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("twoValParams.kt") public void testTwoValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("twoVarParams.kt") public void testTwoVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("unitComponent.kt") public void testUnitComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt"); doTestWithStdlib(fileName); } @@ -1179,42 +1179,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Copy extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCopy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorWithDefaultParam.kt") public void testConstructorWithDefaultParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("copyInObjectNestedDataClass.kt") public void testCopyInObjectNestedDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3033.kt") public void testKt3033() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt"); doTestWithStdlib(fileName); } @TestMetadata("valInConstructorParams.kt") public void testValInConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("varInConstructorParams.kt") public void testVarInConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("withGenericParameter.kt") public void testWithGenericParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt"); doTestWithStdlib(fileName); } } @@ -1224,42 +1224,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Equals extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") public void testAlreadyDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt"); doTestWithStdlib(fileName); } @TestMetadata("alreadyDeclaredWrongSignature.kt") public void testAlreadyDeclaredWrongSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericarray.kt") public void testGenericarray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt"); doTestWithStdlib(fileName); } @TestMetadata("intarray.kt") public void testIntarray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullother.kt") public void testNullother() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt"); doTestWithStdlib(fileName); } @TestMetadata("sameinstance.kt") public void testSameinstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt"); doTestWithStdlib(fileName); } } @@ -1269,84 +1269,84 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Hashcode extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInHashcode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") public void testAlreadyDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt"); doTestWithStdlib(fileName); } @TestMetadata("alreadyDeclaredWrongSignature.kt") public void testAlreadyDeclaredWrongSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt"); doTestWithStdlib(fileName); } @TestMetadata("boolean.kt") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt"); doTestWithStdlib(fileName); } @TestMetadata("byte.kt") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt"); doTestWithStdlib(fileName); } @TestMetadata("char.kt") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt"); doTestWithStdlib(fileName); } @TestMetadata("double.kt") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt"); doTestWithStdlib(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericNull.kt") public void testGenericNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt"); doTestWithStdlib(fileName); } @TestMetadata("int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt"); doTestWithStdlib(fileName); } @TestMetadata("long.kt") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt"); doTestWithStdlib(fileName); } @TestMetadata("null.kt") public void testNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt"); doTestWithStdlib(fileName); } @TestMetadata("short.kt") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt"); doTestWithStdlib(fileName); } } @@ -1356,48 +1356,48 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Tostring extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTostring() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") public void testAlreadyDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt"); doTestWithStdlib(fileName); } @TestMetadata("alreadyDeclaredWrongSignature.kt") public void testAlreadyDeclaredWrongSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("arrayParams.kt") public void testArrayParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("changingVarParam.kt") public void testChangingVarParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericParam.kt") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt"); doTestWithStdlib(fileName); } @TestMetadata("mixedParams.kt") public void testMixedParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt"); doTestWithStdlib(fileName); } @TestMetadata("unitComponent.kt") public void testUnitComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt"); doTestWithStdlib(fileName); } } @@ -1408,12 +1408,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class DeadCodeElimination extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDeadCodeElimination() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/deadCodeElimination"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyVariableRange.kt") public void testEmptyVariableRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/deadCodeElimination/emptyVariableRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/deadCodeElimination/emptyVariableRange.kt"); doTestWithStdlib(fileName); } } @@ -1423,7 +1423,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt6382.kt") @@ -1437,18 +1437,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("checkIfConstructorIsSynthetic.kt") public void testCheckIfConstructorIsSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/checkIfConstructorIsSynthetic.kt"); doTestWithStdlib(fileName); } @TestMetadata("manyArgs.kt") public void testManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt"); doTestWithStdlib(fileName); } } @@ -1459,36 +1459,36 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDelegatedProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/delegatedProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt6722.kt") public void testKt6722() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/kt6722.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/kt6722.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt9712.kt") public void testKt9712() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/kt9712.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/kt9712.kt"); doTestWithStdlib(fileName); } @TestMetadata("protectedVarWithPrivateSet.kt") public void testProtectedVarWithPrivateSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/protectedVarWithPrivateSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/protectedVarWithPrivateSet.kt"); doTestWithStdlib(fileName); } @TestMetadata("stackOverflowOnCallFromGetValue.kt") public void testStackOverflowOnCallFromGetValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/stackOverflowOnCallFromGetValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/stackOverflowOnCallFromGetValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("useKPropertyLater.kt") public void testUseKPropertyLater() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/useKPropertyLater.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/delegatedProperty/useKPropertyLater.kt"); doTestWithStdlib(fileName); } } @@ -1498,12 +1498,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("sortEnumEntries.kt") public void testSortEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/enum/sortEnumEntries.kt"); doTestWithStdlib(fileName); } } @@ -1513,102 +1513,102 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Evaluate extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEvaluate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("char.kt") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/char.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/char.kt"); doTestWithStdlib(fileName); } @TestMetadata("divide.kt") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt"); doTestWithStdlib(fileName); } @TestMetadata("infixCallBinary.kt") public void testInfixCallBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt"); doTestWithStdlib(fileName); } @TestMetadata("intrincics.kt") public void testIntrincics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt9443.kt") public void testKt9443() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/kt9443.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/kt9443.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValue.kt") public void testMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueByte.kt") public void testMaxValueByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueInt.kt") public void testMaxValueInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt"); doTestWithStdlib(fileName); } @TestMetadata("miltiply.kt") public void testMiltiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt"); doTestWithStdlib(fileName); } @TestMetadata("minus.kt") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt"); doTestWithStdlib(fileName); } @TestMetadata("mod.kt") public void testMod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt"); doTestWithStdlib(fileName); } @TestMetadata("paranthesized.kt") public void testParanthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt"); doTestWithStdlib(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleCallBinary.kt") public void testSimpleCallBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt"); doTestWithStdlib(fileName); } @TestMetadata("unaryMinus.kt") public void testUnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt"); doTestWithStdlib(fileName); } @TestMetadata("unaryPlus.kt") public void testUnaryPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt"); doTestWithStdlib(fileName); } } @@ -1618,78 +1618,78 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class FullJdk extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFullJdk() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classpath.kt") public void testClasspath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt"); doTestWithStdlib(fileName); } @TestMetadata("constFlags.kt") public void testConstFlags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/constFlags.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/constFlags.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericBackingFieldSignature.kt") public void testGenericBackingFieldSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericMethodSignature.kt") public void testGenericMethodSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("ifInWhile.kt") public void testIfInWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt"); doTestWithStdlib(fileName); } @TestMetadata("intCountDownLatchExtension.kt") public void testIntCountDownLatchExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt"); doTestWithStdlib(fileName); } @TestMetadata("jvmAnnotationFlags.kt") public void testJvmAnnotationFlags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/jvmAnnotationFlags.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2423.kt") public void testKt2423() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2509.kt") public void testKt2509() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt434.kt") public void testKt434() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt"); doTestWithStdlib(fileName); } @TestMetadata("lateinitVisibility.kt") public void testLateinitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/lateinitVisibility.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformTypeAssertionStackTrace.kt") public void testPlatformTypeAssertionStackTrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/platformTypeAssertionStackTrace.kt"); doTestWithStdlib(fileName); } @@ -1698,42 +1698,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Native extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNative() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/native"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/native"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("default.kt") public void testDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/default.kt"); doTestWithStdlib(fileName); } @TestMetadata("nativePropertyAccessors.kt") public void testNativePropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/nativePropertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateStatic.kt") public void testPrivateStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/privateStatic.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleNative.kt") public void testSimpleNative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/simpleNative.kt"); doTestWithStdlib(fileName); } @TestMetadata("staticNative.kt") public void testStaticNative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/staticNative.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/native/topLevel.kt"); doTestWithStdlib(fileName); } } @@ -1743,66 +1743,66 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Regressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("collections.kt") public void testCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/collections.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1202.kt") public void testKt1202() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1202.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1202.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1406.kt") public void testKt1406() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1406.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1406.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1770.kt") public void testKt1770() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1770.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt1770.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt274.kt") public void testKt274() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt274.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt274.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt528.kt") public void testKt528() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt528.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt529.kt") public void testKt529() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt529.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt533.kt") public void testKt533() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt533.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6485.kt") public void testKt6485() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt6485.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt6485.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt864.kt") public void testKt864() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt864.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/regressions/kt864.kt"); doTestWithStdlib(fileName); } } @@ -1812,24 +1812,24 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Smap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSmap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/smap"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/smap"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("chainCalls.kt") public void testChainCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/chainCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/chainCalls.kt"); doTestWithStdlib(fileName); } @TestMetadata("infixCalls.kt") public void testInfixCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/infixCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/infixCalls.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleCallWithParams.kt") public void testSimpleCallWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/simpleCallWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/smap/simpleCallWithParams.kt"); doTestWithStdlib(fileName); } } @@ -1839,72 +1839,72 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Synchronized extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSynchronized() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("changeMonitor.kt") public void testChangeMonitor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/changeMonitor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/changeMonitor.kt"); doTestWithStdlib(fileName); } @TestMetadata("exceptionInMonitorExpression.kt") public void testExceptionInMonitorExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/exceptionInMonitorExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/exceptionInMonitorExpression.kt"); doTestWithStdlib(fileName); } @TestMetadata("finally.kt") public void testFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/finally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/finally.kt"); doTestWithStdlib(fileName); } @TestMetadata("longValue.kt") public void testLongValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/longValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/longValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedDifferentObjects.kt") public void testNestedDifferentObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedDifferentObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedDifferentObjects.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedSameObject.kt") public void testNestedSameObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedSameObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedSameObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonLocalReturn.kt") public void testNonLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nonLocalReturn.kt"); doTestWithStdlib(fileName); } @TestMetadata("objectValue.kt") public void testObjectValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/objectValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/objectValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("sync.kt") public void testSync() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/sync.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/sync.kt"); doTestWithStdlib(fileName); } @TestMetadata("value.kt") public void testValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/value.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/value.kt"); doTestWithStdlib(fileName); } @TestMetadata("wait.kt") public void testWait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/wait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/wait.kt"); doTestWithStdlib(fileName); } } @@ -1915,42 +1915,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class HashPMap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInHashPMap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/hashPMap"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/hashPMap"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/empty.kt"); doTestWithStdlib(fileName); } @TestMetadata("manyNumbers.kt") public void testManyNumbers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/manyNumbers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/manyNumbers.kt"); doTestWithStdlib(fileName); } @TestMetadata("rewriteWithDifferent.kt") public void testRewriteWithDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithDifferent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithDifferent.kt"); doTestWithStdlib(fileName); } @TestMetadata("rewriteWithEqual.kt") public void testRewriteWithEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithEqual.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithEqual.kt"); doTestWithStdlib(fileName); } @TestMetadata("simplePlusGet.kt") public void testSimplePlusGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusGet.kt"); doTestWithStdlib(fileName); } @TestMetadata("simplePlusMinus.kt") public void testSimplePlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusMinus.kt"); doTestWithStdlib(fileName); } } @@ -1960,18 +1960,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt6895.kt") public void testKt6895() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/inline/kt6895.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/inline/kt6895.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt9644let.kt") public void testKt9644let() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/inline/kt9644let.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/inline/kt9644let.kt"); doTestWithStdlib(fileName); } } @@ -1981,24 +1981,24 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Intrinsics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("charToInt.kt") public void testCharToInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/charToInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/charToInt.kt"); doTestWithStdlib(fileName); } @TestMetadata("defaultObjectMapping.kt") public void testDefaultObjectMapping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/defaultObjectMapping.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5937.kt") public void testKt5937() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/kt5937.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/intrinsics/kt5937.kt"); doTestWithStdlib(fileName); } } @@ -2008,30 +2008,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Jdk extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJdk() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdk"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdk"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/arrayList.kt"); doTestWithStdlib(fileName); } @TestMetadata("hashMap.kt") public void testHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/hashMap.kt"); doTestWithStdlib(fileName); } @TestMetadata("iteratingOverHashMap.kt") public void testIteratingOverHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/iteratingOverHashMap.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1397.kt") public void testKt1397() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdk/kt1397.kt"); doTestWithStdlib(fileName); } } @@ -2041,78 +2041,78 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class JvmField extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmField"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmField"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("captureClassFields.kt") public void testCaptureClassFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/captureClassFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/captureClassFields.kt"); doTestWithStdlib(fileName); } @TestMetadata("capturePackageFields.kt") public void testCapturePackageFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/capturePackageFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/capturePackageFields.kt"); doTestWithStdlib(fileName); } @TestMetadata("checkNoAccessors.kt") public void testCheckNoAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/checkNoAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/checkNoAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("classFieldReference.kt") public void testClassFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/classFieldReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/classFieldReference.kt"); doTestWithStdlib(fileName); } @TestMetadata("classFieldReflection.kt") public void testClassFieldReflection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/classFieldReflection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/classFieldReflection.kt"); doTestWithStdlib(fileName); } @TestMetadata("publicField.kt") public void testPublicField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/publicField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/publicField.kt"); doTestWithStdlib(fileName); } @TestMetadata("superCall.kt") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/superCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/superCall.kt"); doTestWithStdlib(fileName); } @TestMetadata("superCall2.kt") public void testSuperCall2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/superCall2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/superCall2.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFieldReference.kt") public void testTopLevelFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/topLevelFieldReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/topLevelFieldReference.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFieldReflection.kt") public void testTopLevelFieldReflection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/topLevelFieldReflection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/topLevelFieldReflection.kt"); doTestWithStdlib(fileName); } @TestMetadata("visibility.kt") public void testVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/visibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/visibility.kt"); doTestWithStdlib(fileName); } @TestMetadata("writeFieldReference.kt") public void testWriteFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/writeFieldReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmField/writeFieldReference.kt"); doTestWithStdlib(fileName); } } @@ -2122,66 +2122,66 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class JvmName extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmName() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmName"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmName"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callableReference.kt") public void testCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/callableReference.kt"); doTestWithStdlib(fileName); } @TestMetadata("clashingErasure.kt") public void testClashingErasure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/clashingErasure.kt"); doTestWithStdlib(fileName); } @TestMetadata("classMembers.kt") public void testClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/classMembers.kt"); doTestWithStdlib(fileName); } @TestMetadata("functionName.kt") public void testFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/functionName.kt"); doTestWithStdlib(fileName); } @TestMetadata("multifileClass.kt") public void testMultifileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("multifileClassWithLocalClass.kt") public void testMultifileClassWithLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("multifileClassWithLocalGeneric.kt") public void testMultifileClassWithLocalGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/multifileClassWithLocalGeneric.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccessorsUseSite.kt") public void testPropertyAccessorsUseSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/propertyAccessorsUseSite.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/propertyAccessorsUseSite.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyName.kt") public void testPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/propertyName.kt"); doTestWithStdlib(fileName); } @TestMetadata("renamedFileClass.kt") public void testRenamedFileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/renamedFileClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmName/renamedFileClass.kt"); doTestWithStdlib(fileName); } } @@ -2191,60 +2191,60 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class JvmOverloads extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmOverloads() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmOverloads"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("companionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("defaultsNotAtEnd.kt") public void testDefaultsNotAtEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt"); doTestWithStdlib(fileName); } @TestMetadata("doubleParameters.kt") public void testDoubleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionMethod.kt") public void testExtensionMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt"); doTestWithStdlib(fileName); } @TestMetadata("multipleDefaultParameters.kt") public void testMultipleDefaultParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonDefaultParameter.kt") public void testNonDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt"); doTestWithStdlib(fileName); } @TestMetadata("primaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt"); doTestWithStdlib(fileName); } } @@ -2254,90 +2254,90 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class JvmStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jvmStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("closure.kt") public void testClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/closure.kt"); doTestWithStdlib(fileName); } @TestMetadata("convention.kt") public void testConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/convention.kt"); doTestWithStdlib(fileName); } @TestMetadata("default.kt") public void testDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/default.kt"); doTestWithStdlib(fileName); } @TestMetadata("explicitObject.kt") public void testExplicitObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/explicitObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("funAccess.kt") public void testFunAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/funAccess.kt"); doTestWithStdlib(fileName); } @TestMetadata("importStaticMemberFromObject.kt") public void testImportStaticMemberFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/importStaticMemberFromObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/importStaticMemberFromObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("inline.kt") public void testInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/inline.kt"); doTestWithStdlib(fileName); } @TestMetadata("postfixInc.kt") public void testPostfixInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/postfixInc.kt"); doTestWithStdlib(fileName); } @TestMetadata("prefixInc.kt") public void testPrefixInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/prefixInc.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateMethod.kt") public void testPrivateMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/privateMethod.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccess.kt") public void testPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAccess.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAsDefault.kt") public void testPropertyAsDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/propertyAsDefault.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/simple.kt"); doTestWithStdlib(fileName); } @TestMetadata("syntheticAccessor.kt") public void testSyntheticAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jvmStatic/syntheticAccessor.kt"); doTestWithStdlib(fileName); } } @@ -2347,60 +2347,60 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class LazyCodegen extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLazyCodegen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("exceptionInFieldInitializer.kt") public void testExceptionInFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/exceptionInFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/exceptionInFieldInitializer.kt"); doTestWithStdlib(fileName); } @TestMetadata("ifElse.kt") public void testIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/ifElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/ifElse.kt"); doTestWithStdlib(fileName); } @TestMetadata("increment.kt") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/increment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/increment.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeAssign.kt") public void testSafeAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssign.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeAssignComplex.kt") public void testSafeAssignComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssignComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeAssignComplex.kt"); doTestWithStdlib(fileName); } @TestMetadata("safeCallAndArray.kt") public void testSafeCallAndArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeCallAndArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/safeCallAndArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("toString.kt") public void testToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/toString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/toString.kt"); doTestWithStdlib(fileName); } @TestMetadata("tryCatchExpression.kt") public void testTryCatchExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/tryCatchExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/tryCatchExpression.kt"); doTestWithStdlib(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/when.kt"); doTestWithStdlib(fileName); } @@ -2409,60 +2409,60 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Optimizations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOptimizations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("negateConstantCompare.kt") public void testNegateConstantCompare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateConstantCompare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateConstantCompare.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateFalse.kt") public void testNegateFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalse.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateFalseVar.kt") public void testNegateFalseVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVar.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateFalseVarChain.kt") public void testNegateFalseVarChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVarChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateFalseVarChain.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateObjectComp.kt") public void testNegateObjectComp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateObjectComp2.kt") public void testNegateObjectComp2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateObjectComp2.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateTrue.kt") public void testNegateTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrue.kt"); doTestWithStdlib(fileName); } @TestMetadata("negateTrueVar.kt") public void testNegateTrueVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrueVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/negateTrueVar.kt"); doTestWithStdlib(fileName); } @TestMetadata("noOptimization.kt") public void testNoOptimization() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/noOptimization.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen/optimizations/noOptimization.kt"); doTestWithStdlib(fileName); } } @@ -2473,30 +2473,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class LocalFunInLambda extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalFunInLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/localFunInLambda"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/localFunInLambda"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("definedWithinLambda.kt") public void testDefinedWithinLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("definedWithinLambdaInnerUsage1.kt") public void testDefinedWithinLambdaInnerUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambdaInnerUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambdaInnerUsage1.kt"); doTestWithStdlib(fileName); } @TestMetadata("definedWithinLambdaInnerUsage2.kt") public void testDefinedWithinLambdaInnerUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambdaInnerUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/definedWithinLambdaInnerUsage2.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/localFunInLambda/simple.kt"); doTestWithStdlib(fileName); } } @@ -2506,18 +2506,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Mangling extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMangling() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/mangling"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/mangling"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("field.kt") public void testField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/mangling/field.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/mangling/field.kt"); doTestWithStdlib(fileName); } @TestMetadata("fun.kt") public void testFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/mangling/fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/mangling/fun.kt"); doTestWithStdlib(fileName); } } @@ -2527,42 +2527,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class MultiDeclForArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDeclForArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt9828.kt") public void testKt9828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/kt9828.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/kt9828.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclFor.kt") public void testMultiDeclFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclFor.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForValCaptured.kt") public void testMultiDeclForValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/MultiDeclForValCaptured.kt"); doTestWithStdlib(fileName); } @@ -2571,30 +2571,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentExtensionsValCaptured.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTestWithStdlib(fileName); } } @@ -2604,30 +2604,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") public void testMultiDeclForComponentExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt") public void testMultiDeclForComponentExtensionsValCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentExtensionsValCaptured.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensions.kt") public void testMultiDeclForComponentMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt") public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt"); doTestWithStdlib(fileName); } } @@ -2638,18 +2638,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("use.kt") public void testUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns/use.kt"); doTestWithStdlib(fileName); } @TestMetadata("useWithException.kt") public void testUseWithException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/nonLocalReturns/useWithException.kt"); doTestWithStdlib(fileName); } } @@ -2659,12 +2659,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class PrivateConstructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrivateConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/privateConstructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/privateConstructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("synthetic.kt") public void testSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/privateConstructor/synthetic.kt"); doTestWithStdlib(fileName); } } @@ -2674,30 +2674,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Ranges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRanges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("forByteProgressionWithIntIncrement.kt") public void testForByteProgressionWithIntIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/forByteProgressionWithIntIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/forByteProgressionWithIntIncrement.kt"); doTestWithStdlib(fileName); } @TestMetadata("forIntRange.kt") public void testForIntRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/forIntRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/forIntRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("multiAssignmentIterationOverIntRange.kt") public void testMultiAssignmentIterationOverIntRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/multiAssignmentIterationOverIntRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/multiAssignmentIterationOverIntRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("rangeContainsString.kt") public void testRangeContainsString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/rangeContainsString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/rangeContainsString.kt"); doTestWithStdlib(fileName); } @@ -2706,186 +2706,186 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Expression extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyDownto.kt") public void testEmptyDownto() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt"); doTestWithStdlib(fileName); } @TestMetadata("emptyRange.kt") public void testEmptyRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactDownToMinValue.kt") public void testInexactDownToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactSteppedDownTo.kt") public void testInexactSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactSteppedRange.kt") public void testInexactSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactToMaxValue.kt") public void testInexactToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("infiniteSteps.kt") public void testInfiniteSteps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueMinusTwoToMaxValue.kt") public void testMaxValueMinusTwoToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueToMaxValue.kt") public void testMaxValueToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueToMinValue.kt") public void testMaxValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("nanEnds.kt") public void testNanEnds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt"); doTestWithStdlib(fileName); } @TestMetadata("oneElementDownTo.kt") public void testOneElementDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("oneElementRange.kt") public void testOneElementRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("openRange.kt") public void testOpenRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionDownToMinValue.kt") public void testProgressionDownToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt") public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueToMaxValue.kt") public void testProgressionMaxValueToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueToMinValue.kt") public void testProgressionMaxValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMinValueToMinValue.kt") public void testProgressionMinValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedBackSequence.kt") public void testReversedBackSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedEmptyBackSequence.kt") public void testReversedEmptyBackSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedEmptyRange.kt") public void testReversedEmptyRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedInexactSteppedDownTo.kt") public void testReversedInexactSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedRange.kt") public void testReversedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedSimpleSteppedRange.kt") public void testReversedSimpleSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleDownTo.kt") public void testSimpleDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleRange.kt") public void testSimpleRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleRangeWithNonConstantEnds.kt") public void testSimpleRangeWithNonConstantEnds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleSteppedDownTo.kt") public void testSimpleSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleSteppedRange.kt") public void testSimpleSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt"); doTestWithStdlib(fileName); } } @@ -2895,186 +2895,186 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Literal extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyDownto.kt") public void testEmptyDownto() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt"); doTestWithStdlib(fileName); } @TestMetadata("emptyRange.kt") public void testEmptyRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactDownToMinValue.kt") public void testInexactDownToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactSteppedDownTo.kt") public void testInexactSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactSteppedRange.kt") public void testInexactSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("inexactToMaxValue.kt") public void testInexactToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("infiniteSteps.kt") public void testInfiniteSteps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueMinusTwoToMaxValue.kt") public void testMaxValueMinusTwoToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueToMaxValue.kt") public void testMaxValueToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("maxValueToMinValue.kt") public void testMaxValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("nanEnds.kt") public void testNanEnds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt"); doTestWithStdlib(fileName); } @TestMetadata("oneElementDownTo.kt") public void testOneElementDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("oneElementRange.kt") public void testOneElementRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("openRange.kt") public void testOpenRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionDownToMinValue.kt") public void testProgressionDownToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt") public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueToMaxValue.kt") public void testProgressionMaxValueToMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMaxValueToMinValue.kt") public void testProgressionMaxValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("progressionMinValueToMinValue.kt") public void testProgressionMinValueToMinValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedBackSequence.kt") public void testReversedBackSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedEmptyBackSequence.kt") public void testReversedEmptyBackSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedEmptyRange.kt") public void testReversedEmptyRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedInexactSteppedDownTo.kt") public void testReversedInexactSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedRange.kt") public void testReversedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("reversedSimpleSteppedRange.kt") public void testReversedSimpleSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleDownTo.kt") public void testSimpleDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleRange.kt") public void testSimpleRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleRangeWithNonConstantEnds.kt") public void testSimpleRangeWithNonConstantEnds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleSteppedDownTo.kt") public void testSimpleSteppedDownTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleSteppedRange.kt") public void testSimpleSteppedRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt"); doTestWithStdlib(fileName); } } @@ -3085,7 +3085,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations") @@ -3093,60 +3093,60 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationRetentionAnnotation.kt") public void testAnnotationRetentionAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/annotationRetentionAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccessors.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/propertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/propertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyWithoutBackingField.kt") public void testPropertyWithoutBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/propertyWithoutBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/propertyWithoutBackingField.kt"); doTestWithStdlib(fileName); } @TestMetadata("retentions.kt") public void testRetentions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/retentions.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleClassAnnotation.kt") public void testSimpleClassAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleClassAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleClassAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleConstructorAnnotation.kt") public void testSimpleConstructorAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleConstructorAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleFunAnnotation.kt") public void testSimpleFunAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleFunAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleFunAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleParamAnnotation.kt") public void testSimpleParamAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleParamAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleParamAnnotation.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleValAnnotation.kt") public void testSimpleValAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleValAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/annotations/simpleValAnnotation.kt"); doTestWithStdlib(fileName); } } @@ -3156,114 +3156,114 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Call extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/call"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/call"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cannotCallEnumConstructor.kt") public void testCannotCallEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/cannotCallEnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/cannotCallEnumConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("disallowNullValueForNotNullField.kt") public void testDisallowNullValueForNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/disallowNullValueForNotNullField.kt"); doTestWithStdlib(fileName); } @TestMetadata("equalsHashCodeToString.kt") public void testEqualsHashCodeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/equalsHashCodeToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/equalsHashCodeToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("exceptionHappened.kt") public void testExceptionHappened() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/exceptionHappened.kt"); doTestWithStdlib(fileName); } @TestMetadata("fakeOverride.kt") public void testFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/fakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/fakeOverride.kt"); doTestWithStdlib(fileName); } @TestMetadata("fakeOverrideSubstituted.kt") public void testFakeOverrideSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/fakeOverrideSubstituted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/fakeOverrideSubstituted.kt"); doTestWithStdlib(fileName); } @TestMetadata("incorrectNumberOfArguments.kt") public void testIncorrectNumberOfArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/incorrectNumberOfArguments.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerClassConstructor.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/innerClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/innerClassConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("localClassMember.kt") public void testLocalClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/localClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/localClassMember.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberOfGenericClass.kt") public void testMemberOfGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/memberOfGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/memberOfGenericClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformStatic.kt") public void testPlatformStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStatic.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformStaticInObjectIncorrectReceiver.kt") public void testPlatformStaticInObjectIncorrectReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/platformStaticInObjectIncorrectReceiver.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateProperty.kt") public void testPrivateProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/privateProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/privateProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccessors.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/propertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/propertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("returnUnit.kt") public void testReturnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/returnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/returnUnit.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleConstructor.kt") public void testSimpleConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMemberFunction.kt") public void testSimpleMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleMemberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleMemberFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleTopLevelFunctions.kt") public void testSimpleTopLevelFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/call/simpleTopLevelFunctions.kt"); doTestWithStdlib(fileName); } } @@ -3273,84 +3273,84 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class CallBy extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallBy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/callBy"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/callBy"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultAndNonDefaultIntertwined.kt") public void testDefaultAndNonDefaultIntertwined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/defaultAndNonDefaultIntertwined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/defaultAndNonDefaultIntertwined.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/extensionFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("manyArgumentsOnlyOneDefault.kt") public void testManyArgumentsOnlyOneDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyArgumentsOnlyOneDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyArgumentsOnlyOneDefault.kt"); doTestWithStdlib(fileName); } @TestMetadata("manyMaskArguments.kt") public void testManyMaskArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyMaskArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/manyMaskArguments.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonDefaultParameterOmitted.kt") public void testNonDefaultParameterOmitted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/nonDefaultParameterOmitted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/nonDefaultParameterOmitted.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullValue.kt") public void testNullValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/nullValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/nullValue.kt"); doTestWithStdlib(fileName); } @TestMetadata("ordinaryMethodIsInvokedWhenNoDefaultValuesAreUsed.kt") public void testOrdinaryMethodIsInvokedWhenNoDefaultValuesAreUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/ordinaryMethodIsInvokedWhenNoDefaultValuesAreUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/ordinaryMethodIsInvokedWhenNoDefaultValuesAreUsed.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformStaticInObject.kt") public void testPlatformStaticInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/platformStaticInObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("primitiveDefaultValues.kt") public void testPrimitiveDefaultValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/primitiveDefaultValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/primitiveDefaultValues.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateMemberFunction.kt") public void testPrivateMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/privateMemberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/privateMemberFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleConstructor.kt") public void testSimpleConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleMemberFunciton.kt") public void testSimpleMemberFunciton() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleMemberFunciton.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleMemberFunciton.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleTopLevelFunction.kt") public void testSimpleTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleTopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/callBy/simpleTopLevelFunction.kt"); doTestWithStdlib(fileName); } } @@ -3360,48 +3360,48 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class ClassLiterals extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClassLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationClassLiteral.kt") public void testAnnotationClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/annotationClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/annotationClassLiteral.kt"); doTestWithStdlib(fileName); } @TestMetadata("arrays.kt") public void testArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/arrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/arrays.kt"); doTestWithStdlib(fileName); } @TestMetadata("builtinClassLiterals.kt") public void testBuiltinClassLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/builtinClassLiterals.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericArrays.kt") public void testGenericArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/genericArrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/genericArrays.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/genericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/genericClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedTypeClassLiteral.kt") public void testReifiedTypeClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/reifiedTypeClassLiteral.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleClassLiteral.kt") public void testSimpleClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/simpleClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classLiterals/simpleClassLiteral.kt"); doTestWithStdlib(fileName); } } @@ -3411,54 +3411,54 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classSimpleName.kt") public void testClassSimpleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/classSimpleName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/classSimpleName.kt"); doTestWithStdlib(fileName); } @TestMetadata("companionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/companionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/companionObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("defaultType.kt") public void testDefaultType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/defaultType.kt"); doTestWithStdlib(fileName); } @TestMetadata("jvmName.kt") public void testJvmName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/jvmName.kt"); doTestWithStdlib(fileName); } @TestMetadata("localClassSimpleName.kt") public void testLocalClassSimpleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/localClassSimpleName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/localClassSimpleName.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedClasses.kt") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/nestedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/nestedClasses.kt"); doTestWithStdlib(fileName); } @TestMetadata("objectInstance.kt") public void testObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/objectInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/objectInstance.kt"); doTestWithStdlib(fileName); } @TestMetadata("qualifiedName.kt") public void testQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt"); doTestWithStdlib(fileName); } } @@ -3468,30 +3468,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Constructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/constructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/constructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classesWithoutConstructors.kt") public void testClassesWithoutConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/classesWithoutConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/classesWithoutConstructors.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructorName.kt") public void testConstructorName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/constructorName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/constructorName.kt"); doTestWithStdlib(fileName); } @TestMetadata("primaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/primaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/primaryConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleGetConstructors.kt") public void testSimpleGetConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/constructors/simpleGetConstructors.kt"); doTestWithStdlib(fileName); } } @@ -3501,144 +3501,144 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Enclosing extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnclosing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectInInlinedLambda.kt") public void testAnonymousObjectInInlinedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/anonymousObjectInInlinedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/anonymousObjectInInlinedLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("classInLambda.kt") public void testClassInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/classInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/classInLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("functionExpressionInProperty.kt") public void testFunctionExpressionInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/functionExpressionInProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/functionExpressionInProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6368.kt") public void testKt6368() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6368.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6691_lambdaInSamConstructor.kt") public void testKt6691_lambdaInSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6691_lambdaInSamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/kt6691_lambdaInSamConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInClassObject.kt") public void testLambdaInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInClassObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInConstructor.kt") public void testLambdaInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInFunction.kt") public void testLambdaInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInLambda.kt") public void testLambdaInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInLocalClassConstructor.kt") public void testLambdaInLocalClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInLocalClassSuperCall.kt") public void testLambdaInLocalClassSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassSuperCall.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInLocalFunction.kt") public void testLambdaInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInMemberFunction.kt") public void testLambdaInMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInMemberFunctionInLocalClass.kt") public void testLambdaInMemberFunctionInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunctionInLocalClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInMemberFunctionInNestedClass.kt") public void testLambdaInMemberFunctionInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInMemberFunctionInNestedClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInObjectDeclaration.kt") public void testLambdaInObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectDeclaration.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInObjectExpression.kt") public void testLambdaInObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInObjectLiteralSuperCall.kt") public void testLambdaInObjectLiteralSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectLiteralSuperCall.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInPackage.kt") public void testLambdaInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPackage.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInPropertyGetter.kt") public void testLambdaInPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertyGetter.kt"); doTestWithStdlib(fileName); } @TestMetadata("lambdaInPropertySetter.kt") public void testLambdaInPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInPropertySetter.kt"); doTestWithStdlib(fileName); } @TestMetadata("localClassInTopLevelFunction.kt") public void testLocalClassInTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/localClassInTopLevelFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("objectInLambda.kt") public void testObjectInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/objectInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/objectInLambda.kt"); doTestWithStdlib(fileName); } } @@ -3648,42 +3648,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionFromStdlib.kt") public void testFunctionFromStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/functionFromStdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/functionFromStdlib.kt"); doTestWithStdlib(fileName); } @TestMetadata("localFunctionName.kt") public void testLocalFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/localFunctionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/localFunctionName.kt"); doTestWithStdlib(fileName); } @TestMetadata("platformName.kt") public void testPlatformName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/platformName.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateMemberFunction.kt") public void testPrivateMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/privateMemberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/privateMemberFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleGetFunctions.kt") public void testSimpleGetFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/simpleGetFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/simpleGetFunctions.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleNames.kt") public void testSimpleNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/simpleNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/functions/simpleNames.kt"); doTestWithStdlib(fileName); } } @@ -3693,18 +3693,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class GenericSignature extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInGenericSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt5112.kt") public void testKt5112() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6106.kt") public void testKt6106() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt6106.kt"); doTestWithStdlib(fileName); } } @@ -3714,30 +3714,30 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class KClassInAnnotation extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInKClassInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt"); doTestWithStdlib(fileName); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt"); doTestWithStdlib(fileName); } @TestMetadata("checkcast.kt") public void testCheckcast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/checkcast.kt"); doTestWithStdlib(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt"); doTestWithStdlib(fileName); } } @@ -3747,12 +3747,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class LambdaClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLambdaClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/lambdaClasses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/lambdaClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("parameterNamesAndNullability.kt") public void testParameterNamesAndNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/lambdaClasses/parameterNamesAndNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/lambdaClasses/parameterNamesAndNullability.kt"); doTestWithStdlib(fileName); } } @@ -3762,54 +3762,54 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Mapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/constructor.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/functions.kt"); doTestWithStdlib(fileName); } @TestMetadata("mappedClassIsEqualToClassLiteral.kt") public void testMappedClassIsEqualToClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/mappedClassIsEqualToClassLiteral.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberProperty.kt") public void testMemberProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccessors.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/propertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/propertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("syntheticFields.kt") public void testSyntheticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/syntheticFields.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt"); doTestWithStdlib(fileName); } @@ -3818,18 +3818,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class PlatformStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("companionObjectFunction.kt") public void testCompanionObjectFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/companionObjectFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("objectFunction.kt") public void testObjectFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/platformStatic/objectFunction.kt"); doTestWithStdlib(fileName); } } @@ -3839,60 +3839,60 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Types extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/array.kt"); doTestWithStdlib(fileName); } @TestMetadata("constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/constructors.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberFunctions.kt") public void testMemberFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/memberFunctions.kt"); doTestWithStdlib(fileName); } @TestMetadata("overrideAnyWithPrimitive.kt") public void testOverrideAnyWithPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/overrideAnyWithPrimitive.kt"); doTestWithStdlib(fileName); } @TestMetadata("parameterizedTypes.kt") public void testParameterizedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/parameterizedTypes.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyAccessors.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/propertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelFunctions.kt") public void testTopLevelFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/topLevelFunctions.kt"); doTestWithStdlib(fileName); } @TestMetadata("typeParameters.kt") public void testTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/typeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/typeParameters.kt"); doTestWithStdlib(fileName); } @TestMetadata("unit.kt") public void testUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/types/unit.kt"); doTestWithStdlib(fileName); } } @@ -3903,72 +3903,72 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class MethodsFromAny extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMethodsFromAny() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classToString.kt") public void testClassToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/classToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/classToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("extensionPropertyReceiverToString.kt") public void testExtensionPropertyReceiverToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("functionEqualsHashCode.kt") public void testFunctionEqualsHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionEqualsHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionEqualsHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("functionToString.kt") public void testFunctionToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberExtensionToString.kt") public void testMemberExtensionToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("parametersEqualsHashCode.kt") public void testParametersEqualsHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/parametersEqualsHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/parametersEqualsHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("parametersToString.kt") public void testParametersToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/parametersToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/parametersToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyEqualsHashCode.kt") public void testPropertyEqualsHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyEqualsHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyEqualsHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyToString.kt") public void testPropertyToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt"); doTestWithStdlib(fileName); } @TestMetadata("typeEqualsHashCode.kt") public void testTypeEqualsHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeEqualsHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeEqualsHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("typeToString.kt") public void testTypeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt"); doTestWithStdlib(fileName); } } @@ -3978,42 +3978,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class NoKotlinReflect extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNoKotlinReflect() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaClass.kt") public void testJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/javaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/javaClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("primitiveJavaClass.kt") public void testPrimitiveJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/primitiveJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/primitiveJavaClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyGetSetName.kt") public void testPropertyGetSetName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/propertyGetSetName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/propertyGetSetName.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyInstanceof.kt") public void testPropertyInstanceof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/propertyInstanceof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/propertyInstanceof.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedTypeJavaClass.kt") public void testReifiedTypeJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/reifiedTypeJavaClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleClassLiterals.kt") public void testSimpleClassLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/simpleClassLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/noKotlinReflect/simpleClassLiterals.kt"); doTestWithStdlib(fileName); } } @@ -4023,36 +4023,36 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionParameterNameAndIndex.kt") public void testFunctionParameterNameAndIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/functionParameterNameAndIndex.kt"); doTestWithStdlib(fileName); } @TestMetadata("isMarkedNullable.kt") public void testIsMarkedNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/isMarkedNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/isMarkedNullable.kt"); doTestWithStdlib(fileName); } @TestMetadata("isOptional.kt") public void testIsOptional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/isOptional.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/isOptional.kt"); doTestWithStdlib(fileName); } @TestMetadata("kinds.kt") public void testKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/kinds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/kinds.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/propertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/parameters/propertySetter.kt"); doTestWithStdlib(fileName); } } @@ -4062,102 +4062,102 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("allVsDeclared.kt") public void testAllVsDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/allVsDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/allVsDeclared.kt"); doTestWithStdlib(fileName); } @TestMetadata("callPrivatePropertyFromGetProperties.kt") public void testCallPrivatePropertyFromGetProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt"); doTestWithStdlib(fileName); } @TestMetadata("fakeOverridesInSubclass.kt") public void testFakeOverridesInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt"); doTestWithStdlib(fileName); } @TestMetadata("genericClassLiteralPropertyReceiverIsStar.kt") public void testGenericClassLiteralPropertyReceiverIsStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/genericClassLiteralPropertyReceiverIsStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/genericClassLiteralPropertyReceiverIsStar.kt"); doTestWithStdlib(fileName); } @TestMetadata("getExtensionPropertiesMutableVsReadonly.kt") public void testGetExtensionPropertiesMutableVsReadonly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt"); doTestWithStdlib(fileName); } @TestMetadata("getPropertiesMutableVsReadonly.kt") public void testGetPropertiesMutableVsReadonly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberAndMemberExtensionWithSameName.kt") public void testMemberAndMemberExtensionWithSameName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateClassVal.kt") public void testPrivateClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateClassVal.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateClassVar.kt") public void testPrivateClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateClassVar.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateFakeOverrideFromSuperclass.kt") public void testPrivateFakeOverrideFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateFakeOverrideFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateFakeOverrideFromSuperclass.kt"); doTestWithStdlib(fileName); } @TestMetadata("privatePlatformStaticVarInObject.kt") public void testPrivatePlatformStaticVarInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePlatformStaticVarInObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("privatePropertyCallIsAccessibleOnAccessors.kt") public void testPrivatePropertyCallIsAccessibleOnAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privatePropertyCallIsAccessibleOnAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateToThisAccessors.kt") public void testPrivateToThisAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateToThisAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/privateToThisAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("propertyOfNestedClassAndArrayType.kt") public void testPropertyOfNestedClassAndArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/propertyOfNestedClassAndArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/propertyOfNestedClassAndArrayType.kt"); doTestWithStdlib(fileName); } @TestMetadata("protectedClassVar.kt") public void testProtectedClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/protectedClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/protectedClassVar.kt"); doTestWithStdlib(fileName); } @TestMetadata("simpleGetProperties.kt") public void testSimpleGetProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt"); doTestWithStdlib(fileName); } @@ -4167,35 +4167,35 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode public static class Accessors extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorNames.kt") public void testAccessorNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/accessorNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/accessorNames.kt"); doTestWithStdlib(fileName); } public void testAllFilesPresentInAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("extensionPropertyAccessors.kt") public void testExtensionPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/extensionPropertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberExtensions.kt") public void testMemberExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberExtensions.kt"); doTestWithStdlib(fileName); } @TestMetadata("memberPropertyAccessors.kt") public void testMemberPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberPropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/memberPropertyAccessors.kt"); doTestWithStdlib(fileName); } @TestMetadata("topLevelPropertyAccessors.kt") public void testTopLevelPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/topLevelPropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/accessors/topLevelPropertyAccessors.kt"); doTestWithStdlib(fileName); } } @@ -4207,210 +4207,210 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Regressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/regressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/regressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("generic.kt") public void testGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/generic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/generic.kt"); doTestWithStdlib(fileName); } @TestMetadata("getGenericInterfaces.kt") public void testGetGenericInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt"); doTestWithStdlib(fileName); } @TestMetadata("Kt1149.kt") public void testKt1149() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt1149.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt1149.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1172.kt") public void testKt1172() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1172.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1172.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1568.kt") public void testKt1568() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt"); doTestWithStdlib(fileName); } @TestMetadata("Kt1619Test.kt") public void testKt1619Test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt1619Test.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1779.kt") public void testKt1779() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1800.kt") public void testKt1800() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt1932.kt") public void testKt1932() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2017.kt") public void testKt2017() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2017.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2017.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2210.kt") public void testKt2210() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2246.kt") public void testKt2246() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2318.kt") public void testKt2318() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt"); doTestWithStdlib(fileName); } @TestMetadata("Kt2495Test.kt") public void testKt2495Test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt2495Test.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/Kt2495Test.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt2593.kt") public void testKt2593() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3046.kt") public void testKt3046() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt344.kt") public void testKt344() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3442.kt") public void testKt3442() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3442.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3850.kt") public void testKt3850() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3850.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3850.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt4142.kt") public void testKt4142() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4142.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt4259.kt") public void testKt4259() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4259.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt4262.kt") public void testKt4262() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5056.kt") public void testKt5056() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5056.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5056.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5395.kt") public void testKt5395() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5395.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5786_privateWithDefault.kt") public void testKt5786_privateWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5786_privateWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5786_privateWithDefault.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5953.kt") public void testKt5953() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5953.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6434.kt") public void testKt6434() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt6434_2.kt") public void testKt6434_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434_2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt6434_2.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt715.kt") public void testKt715() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt789.kt") public void testKt789() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt998.kt") public void testKt998() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt998.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt998.kt"); doTestWithStdlib(fileName); } @TestMetadata("objectCaptureOuterConstructorProperty.kt") public void testObjectCaptureOuterConstructorProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt"); doTestWithStdlib(fileName); } @TestMetadata("referenceToSelfInLocal.kt") public void testReferenceToSelfInLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt"); doTestWithStdlib(fileName); } @TestMetadata("typeCastException.kt") public void testTypeCastException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt"); doTestWithStdlib(fileName); } } @@ -4420,156 +4420,156 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Reified extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReified() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reified"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reified"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("anonymousObjectNoPropagate.kt") public void testAnonymousObjectNoPropagate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectNoPropagate.kt"); doTestWithStdlib(fileName); } @TestMetadata("anonymousObjectReifiedSupertype.kt") public void testAnonymousObjectReifiedSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectReifiedSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/anonymousObjectReifiedSupertype.kt"); doTestWithStdlib(fileName); } @TestMetadata("checkcast.kt") public void testCheckcast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/checkcast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/checkcast.kt"); doTestWithStdlib(fileName); } @TestMetadata("copyToArray.kt") public void testCopyToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/copyToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/copyToArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("DIExample.kt") public void testDIExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/DIExample.kt"); doTestWithStdlib(fileName); } @TestMetadata("defaultJavaClass.kt") public void testDefaultJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/defaultJavaClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("filterIsInstance.kt") public void testFilterIsInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/filterIsInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/filterIsInstance.kt"); doTestWithStdlib(fileName); } @TestMetadata("innerAnonymousObject.kt") public void testInnerAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/innerAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/innerAnonymousObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("instanceof.kt") public void testInstanceof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/instanceof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/instanceof.kt"); doTestWithStdlib(fileName); } @TestMetadata("javaClass.kt") public void testJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/javaClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedReified.kt") public void testNestedReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nestedReified.kt"); doTestWithStdlib(fileName); } @TestMetadata("nestedReifiedSignature.kt") public void testNestedReifiedSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nestedReifiedSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nestedReifiedSignature.kt"); doTestWithStdlib(fileName); } @TestMetadata("newArrayInt.kt") public void testNewArrayInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/newArrayInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/newArrayInt.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonInlineableLambdaInReifiedFunction.kt") public void testNonInlineableLambdaInReifiedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/nonInlineableLambdaInReifiedFunction.kt"); doTestWithStdlib(fileName); } @TestMetadata("recursiveInnerAnonymousObject.kt") public void testRecursiveInnerAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveInnerAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveInnerAnonymousObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("recursiveNewArray.kt") public void testRecursiveNewArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveNewArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveNewArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("recursiveNonInlineableLambda.kt") public void testRecursiveNonInlineableLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/recursiveNonInlineableLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedInlineFunOfObject.kt") public void testReifiedInlineFunOfObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedInlineFunOfObjectWithinReified.kt") public void testReifiedInlineFunOfObjectWithinReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineFunOfObjectWithinReified.kt"); doTestWithStdlib(fileName); } @TestMetadata("reifiedInlineIntoNonInlineableLambda.kt") public void testReifiedInlineIntoNonInlineableLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/reifiedInlineIntoNonInlineableLambda.kt"); doTestWithStdlib(fileName); } @TestMetadata("safecast.kt") public void testSafecast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/safecast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/safecast.kt"); doTestWithStdlib(fileName); } @TestMetadata("sameIndexRecursive.kt") public void testSameIndexRecursive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/sameIndexRecursive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/sameIndexRecursive.kt"); doTestWithStdlib(fileName); } @TestMetadata("spreads.kt") public void testSpreads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/spreads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/spreads.kt"); doTestWithStdlib(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reified/varargs.kt"); doTestWithStdlib(fileName); } } @@ -4579,36 +4579,36 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class StoreStackBeforeInline extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStoreStackBeforeInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentTypes.kt") public void testDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/differentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/differentTypes.kt"); doTestWithStdlib(fileName); } @TestMetadata("primitiveMerge.kt") public void testPrimitiveMerge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/primitiveMerge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/primitiveMerge.kt"); doTestWithStdlib(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/simple.kt"); doTestWithStdlib(fileName); } @TestMetadata("unreachableMarker.kt") public void testUnreachableMarker() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/unreachableMarker.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/unreachableMarker.kt"); doTestWithStdlib(fileName); } @TestMetadata("withLambda.kt") public void testWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/withLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/storeStackBeforeInline/withLambda.kt"); doTestWithStdlib(fileName); } } @@ -4618,24 +4618,24 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Strings extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStrings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/strings"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/strings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("forInString.kt") public void testForInString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/forInString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/forInString.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5389_stringBuilderGet.kt") public void testKt5389_stringBuilderGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/kt5389_stringBuilderGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/kt5389_stringBuilderGet.kt"); doTestWithStdlib(fileName); } @TestMetadata("stringPlusOnlyWorksOnString.kt") public void testStringPlusOnlyWorksOnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt"); doTestWithStdlib(fileName); } } @@ -4645,12 +4645,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Synthetic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSynthetic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/synthetic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/synthetic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("syntheticAccessorNames.kt") public void testSyntheticAccessorNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt"); doTestWithStdlib(fileName); } } @@ -4660,36 +4660,36 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class ToArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInToArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/toArray"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/toArray"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("copyToArray.kt") public void testCopyToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/copyToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/copyToArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt3177-copyToArray.kt") public void testKt3177_copyToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/kt3177-copyToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/kt3177-copyToArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("returnCopyToArray.kt") public void testReturnCopyToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/returnCopyToArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/returnCopyToArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("toArray.kt") public void testToArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/toArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/toArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("toArrayAlreadyPresent.kt") public void testToArrayAlreadyPresent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/toArrayAlreadyPresent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/toArrayAlreadyPresent.kt"); doTestWithStdlib(fileName); } } @@ -4699,42 +4699,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class TopLevelPrivate extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTopLevelPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/topLevelPrivate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/topLevelPrivate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("noPrivateNoAccessorsInMultiFileFacade.kt") public void testNoPrivateNoAccessorsInMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade.kt"); doTestWithStdlib(fileName); } @TestMetadata("noPrivateNoAccessorsInMultiFileFacade2.kt") public void testNoPrivateNoAccessorsInMultiFileFacade2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/noPrivateNoAccessorsInMultiFileFacade2.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateInInlineNested.kt") public void testPrivateInInlineNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateInInlineNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateInInlineNested.kt"); doTestWithStdlib(fileName); } @TestMetadata("privateVisibility.kt") public void testPrivateVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/privateVisibility.kt"); doTestWithStdlib(fileName); } @TestMetadata("syntheticAccessor.kt") public void testSyntheticAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessor.kt"); doTestWithStdlib(fileName); } @TestMetadata("syntheticAccessorInMultiFile.kt") public void testSyntheticAccessorInMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessorInMultiFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/topLevelPrivate/syntheticAccessorInMultiFile.kt"); doTestWithStdlib(fileName); } } @@ -4744,18 +4744,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class TypeMapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeMapping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericTypeWithNothing.kt") public void testGenericTypeWithNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/typeMapping/genericTypeWithNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/typeMapping/genericTypeWithNothing.kt"); doTestWithStdlib(fileName); } @TestMetadata("typeParameterMultipleBounds.kt") public void testTypeParameterMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/typeMapping/typeParameterMultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/typeMapping/typeParameterMultipleBounds.kt"); doTestWithStdlib(fileName); } } @@ -4765,18 +4765,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("spreadCopiesArray.kt") public void testSpreadCopiesArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/spreadCopiesArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/spreadCopiesArray.kt"); doTestWithStdlib(fileName); } @TestMetadata("varargInFunParam.kt") public void testVarargInFunParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt"); doTestWithStdlib(fileName); } } @@ -4786,54 +4786,54 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("integralWhenWithNoInlinedConstants.kt") public void testIntegralWhenWithNoInlinedConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/integralWhenWithNoInlinedConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/integralWhenWithNoInlinedConstants.kt"); doTestWithStdlib(fileName); } @TestMetadata("kt5448.kt") public void testKt5448() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/kt5448.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/kt5448.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationDense.kt") public void testSwitchOptimizationDense() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationDense.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationDense.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationMultipleConditions.kt") public void testSwitchOptimizationMultipleConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationMultipleConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationMultipleConditions.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationSparse.kt") public void testSwitchOptimizationSparse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationSparse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationSparse.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationStatement.kt") public void testSwitchOptimizationStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationStatement.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationTypes.kt") public void testSwitchOptimizationTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt"); doTestWithStdlib(fileName); } @TestMetadata("switchOptimizationUnordered.kt") public void testSwitchOptimizationUnordered() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationUnordered.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationUnordered.kt"); doTestWithStdlib(fileName); } } @@ -4843,72 +4843,72 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class WhenEnumOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhenEnumOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bigEnum.kt") public void testBigEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt"); doTestWithStdlib(fileName); } @TestMetadata("duplicatingItems.kt") public void testDuplicatingItems() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt"); doTestWithStdlib(fileName); } @TestMetadata("enumInsideClassObject.kt") public void testEnumInsideClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt"); doTestWithStdlib(fileName); } @TestMetadata("expression.kt") public void testExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt"); doTestWithStdlib(fileName); } @TestMetadata("functionLiteralInTopLevel.kt") public void testFunctionLiteralInTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt"); doTestWithStdlib(fileName); } @TestMetadata("manyWhensWithinClass.kt") public void testManyWhensWithinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt"); doTestWithStdlib(fileName); } @TestMetadata("nonConstantEnum.kt") public void testNonConstantEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullableEnum.kt") public void testNullableEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullableEnum.kt"); doTestWithStdlib(fileName); } @TestMetadata("subjectAny.kt") public void testSubjectAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt"); doTestWithStdlib(fileName); } @TestMetadata("withoutElse.kt") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt"); doTestWithStdlib(fileName); } } @@ -4918,42 +4918,42 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @RunWith(JUnit3RunnerWithInners.class) public static class WhenStringOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhenStringOptimization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("duplicatingItems.kt") public void testDuplicatingItems() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItems.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItems.kt"); doTestWithStdlib(fileName); } @TestMetadata("duplicatingItemsSameHashCode.kt") public void testDuplicatingItemsSameHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItemsSameHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItemsSameHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("expression.kt") public void testExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/expression.kt"); doTestWithStdlib(fileName); } @TestMetadata("nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/nullability.kt"); doTestWithStdlib(fileName); } @TestMetadata("sameHashCode.kt") public void testSameHashCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/sameHashCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/sameHashCode.kt"); doTestWithStdlib(fileName); } @TestMetadata("statement.kt") public void testStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/statement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/statement.kt"); doTestWithStdlib(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index efe9d62672f..8742819b25f 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.rmi.* import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.ByteArrayOutputStream import java.io.File import kotlin.concurrent.thread @@ -56,8 +56,8 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() { TestCase.assertEquals("build results differ", CliBaseTest.removePerfOutput(res1.out), CliBaseTest.removePerfOutput(res2.out)) } - private fun getTestBaseDir(): String = JetTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) - private fun getHelloAppBaseDir(): String = JetTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" + private fun getTestBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) + private fun getHelloAppBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" private fun run(logName: String, vararg args: String): Int = runJava(getTestBaseDir(), logName, *args) diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java index 03c781cdd0f..4b36b901c82 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskJsTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.test.rhino.RhinoFunctionResultChecker; import org.jetbrains.kotlin.js.test.rhino.RhinoUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.IOException; @@ -36,7 +36,7 @@ public class AntTaskJsTest extends AbstractAntTaskTest { @NotNull private String getTestDataDir() { - return JetTestUtils.getTestDataPathBase() + "/integration/ant/js/" + getTestName(true); + return KotlinTestUtils.getTestDataPathBase() + "/integration/ant/js/" + getTestName(true); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java index b12621b44fc..4e15fe4f772 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.integration; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,101 +33,101 @@ import java.util.regex.Pattern; public class AntTaskTestGenerated extends AbstractAntTaskTest { @TestMetadata("additionalArguments") public void testAdditionalArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/additionalArguments/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/additionalArguments/"); doTest(fileName); } public void testAllFilesPresentInJvm() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/integration/ant/jvm"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/integration/ant/jvm"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("doNotFailOnError") public void testDoNotFailOnError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/doNotFailOnError/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/doNotFailOnError/"); doTest(fileName); } @TestMetadata("failOnErrorByDefault") public void testFailOnErrorByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/failOnErrorByDefault/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/failOnErrorByDefault/"); doTest(fileName); } @TestMetadata("helloWorld") public void testHelloWorld() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/helloWorld/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/helloWorld/"); doTest(fileName); } @TestMetadata("internalMembers") public void testInternalMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/internalMembers/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/internalMembers/"); doTest(fileName); } @TestMetadata("jvmClasspath") public void testJvmClasspath() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/jvmClasspath/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/jvmClasspath/"); doTest(fileName); } @TestMetadata("mainInFiles") public void testMainInFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/mainInFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/mainInFiles/"); doTest(fileName); } @TestMetadata("moduleName") public void testModuleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleName/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleName/"); doTest(fileName); } @TestMetadata("moduleNameDefault") public void testModuleNameDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleNameDefault/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleNameDefault/"); doTest(fileName); } @TestMetadata("moduleNameWithKotlin") public void testModuleNameWithKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleNameWithKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/moduleNameWithKotlin/"); doTest(fileName); } @TestMetadata("noStdlibForJavac") public void testNoStdlibForJavac() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/noStdlibForJavac/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/noStdlibForJavac/"); doTest(fileName); } @TestMetadata("stdlibForJavacWithNoKotlin") public void testStdlibForJavacWithNoKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/stdlibForJavacWithNoKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/stdlibForJavacWithNoKotlin/"); doTest(fileName); } @TestMetadata("suppressWarnings") public void testSuppressWarnings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/suppressWarnings/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/suppressWarnings/"); doTest(fileName); } @TestMetadata("verbose") public void testVerbose() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/verbose/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/verbose/"); doTest(fileName); } @TestMetadata("version") public void testVersion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/version/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/version/"); doTest(fileName); } @TestMetadata("withKotlinNoJavaSources") public void testWithKotlinNoJavaSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/withKotlinNoJavaSources/"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/withKotlinNoJavaSources/"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index 357f0147a64..2e14136471e 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.integration; import com.intellij.util.ArrayUtil; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.StringsKt; import java.io.File; @@ -28,7 +28,7 @@ import java.util.Collections; public class CompilerSmokeTest extends KotlinIntegrationTestBase { private int run(String logName, String... args) throws Exception { - return runJava(JetTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true), logName, args); + return runJava(KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true), logName, args); } private int runCompiler(String logName, String... arguments) throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 21fd377c98b..0f06e2a817a 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.CliBaseTest; import org.jetbrains.kotlin.cli.common.KotlinVersion; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.PathUtil; @@ -93,7 +93,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { File expectedFile = new File(testDataDir, baseName + ".expected"); String normalizedContent = normalizeOutput(new File(testDataDir), content); - JetTestUtils.assertEqualsToFile(expectedFile, normalizedContent); + KotlinTestUtils.assertEqualsToFile(expectedFile, normalizedContent); } private static int runProcess(GeneralCommandLine commandLine, StringBuilder executionLog) throws ExecutionException { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index dfcf9b39b63..7bd3f85f7e4 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -40,7 +40,7 @@ import java.io.IOException; import java.lang.annotation.Retention; import java.util.Collections; -import static org.jetbrains.kotlin.test.JetTestUtils.*; +import static org.jetbrains.kotlin.test.KotlinTestUtils.*; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 6816707d001..8878d2e0981 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.TestJdkKind; @@ -52,8 +52,8 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit super.setUp(); aDir = new File(tmpdir, "a"); bDir = new File(tmpdir, "b"); - JetTestUtils.mkdirs(aDir); - JetTestUtils.mkdirs(bDir); + KotlinTestUtils.mkdirs(aDir); + KotlinTestUtils.mkdirs(bDir); } public void doTest(@NotNull String fileName) throws Exception { @@ -86,14 +86,14 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit } protected ClassFileFactory compileA(@NotNull File ktAFile) throws IOException { - KotlinCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), - ConfigurationKind.ALL); + KotlinCoreEnvironment jetCoreEnvironment = KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), + ConfigurationKind.ALL); return compileKotlin(ktAFile, aDir, jetCoreEnvironment, getTestRootDisposable()); } protected ClassFileFactory compileB(@NotNull File ktBFile) throws IOException { - CompilerConfiguration configurationWithADirInClasspath = JetTestUtils - .compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), aDir); + CompilerConfiguration configurationWithADirInClasspath = KotlinTestUtils + .compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar(), aDir); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configurationWithADirInClasspath, EnvironmentConfigFiles.JVM_CONFIG_FILES); @@ -108,7 +108,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit String text = FileUtil.loadFile(file, true); - KtFile psiFile = JetTestUtils.createFile(file.getName(), text, jetCoreEnvironment.getProject()); + KtFile psiFile = KotlinTestUtils.createFile(file.getName(), text, jetCoreEnvironment.getProject()); ModuleVisibilityManager.SERVICE.getInstance(jetCoreEnvironment.getProject()).addModule(new ModuleBuilder("module for test", tmpdir.getAbsolutePath(), "test")); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index eeef9f60a08..cf6671c88a9 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -42,7 +42,7 @@ 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.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.test.util.DescriptorValidator; @@ -59,7 +59,7 @@ import java.util.Map; import java.util.regex.Pattern; import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.*; -import static org.jetbrains.kotlin.test.JetTestUtils.*; +import static org.jetbrains.kotlin.test.KotlinTestUtils.*; 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.*; @@ -145,7 +145,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } }); - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); ContentRootsKt.addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath()); JvmContentRootsKt.addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include")); @@ -190,7 +190,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, getAnnotationsJar(), libraryOut), EnvironmentConfigFiles.JVM_CONFIG_FILES); - KtFile jetFile = JetTestUtils.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); + KtFile jetFile = KotlinTestUtils.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); AnalysisResult result = JvmResolveUtil.analyzeFilesWithJavaIntegrationAndCheckForErrors( environment.getProject(), Collections.singleton(jetFile) @@ -225,7 +225,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { assertTrue(srcDir.mkdir()); assertTrue(compiledDir.mkdir()); - List srcFiles = JetTestUtils.createTestFiles( + List srcFiles = KotlinTestUtils.createTestFiles( new File(javaFileName).getName(), FileUtil.loadFile(new File(javaFileName), true), new TestFileFactoryNoModules() { @NotNull @@ -242,7 +242,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } }); - JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( + KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( getTestRootDisposable(), ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK ); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt index db9c8afa6fe..43bb632e567 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.codegen.GenerationUtils import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.utils.join import org.jetbrains.org.objectweb.asm.* @@ -43,7 +43,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { override fun setUp() { super.setUp() - jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable) + jetCoreEnvironment = KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(myTestRootDisposable) } override fun tearDown() { @@ -55,7 +55,7 @@ public abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { val ktFile = File(ktFileName) val text = FileUtil.loadFile(ktFile, true) - val psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment!!.project) + val psiFile = KotlinTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment!!.project) val outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetCoreEnvironment!!) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java index 555b2681529..b224e347e17 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; 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.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import java.io.IOException; @@ -38,15 +38,15 @@ public class AndroidSdkAnnotationsValidityTest extends AbstractSdkAnnotationsVal @Override protected KotlinCoreEnvironment createEnvironment(Disposable parentDisposable) { - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.ANDROID_API, JetTestUtils.getAnnotationsJar() + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( + ConfigurationKind.JDK_ONLY, TestJdkKind.ANDROID_API, KotlinTestUtils.getAnnotationsJar() ); return KotlinCoreEnvironment.createForTests(parentDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); } @Override protected List getClassesToValidate() throws IOException { - JarFile jar = new JarFile(JetTestUtils.findAndroidApiJar()); + JarFile jar = new JarFile(KotlinTestUtils.findAndroidApiJar()); try { Enumeration entries = jar.entries(); Set result = Sets.newLinkedHashSet(); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/BlackBoxMultifileClassKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/BlackBoxMultifileClassKotlinTestGenerated.java index b33231a1612..3c4106ae703 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/BlackBoxMultifileClassKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/BlackBoxMultifileClassKotlinTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxMultifileClassKotlinTestGenerated extends AbstractBlackBoxMultifileClassCodegenTest { public void testAllFilesPresentInBoxMultifileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxMultifileClasses/calls") @@ -40,24 +40,24 @@ public class BlackBoxMultifileClassKotlinTestGenerated extends AbstractBlackBoxM @RunWith(JUnit3RunnerWithInners.class) public static class Calls extends AbstractBlackBoxMultifileClassCodegenTest { public void testAllFilesPresentInCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses/calls"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses/calls"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("callFromOtherPackage.1.kt") public void testCallFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/callFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/callFromOtherPackage.1.kt"); doTestMultifileClassAgainstSources(fileName); } @TestMetadata("valFromOtherPackage.1.kt") public void testValFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/valFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/valFromOtherPackage.1.kt"); doTestMultifileClassAgainstSources(fileName); } @TestMetadata("varFromOtherPackage.1.kt") public void testVarFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/varFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/varFromOtherPackage.1.kt"); doTestMultifileClassAgainstSources(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java index 52a2183cadb..e9ba15d3ef3 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; 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.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.junit.Assert; import java.io.File; @@ -37,7 +37,7 @@ public class CompileEnvironmentTest extends TestCase { File stdlib = ForTestCompileRuntime.runtimeJarForTests(); ExitCode exitCode = new K2JVMCompiler().exec( System.out, - JetTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", + KotlinTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", "-d", out.getAbsolutePath(), "-no-stdlib", "-classpath", stdlib.getAbsolutePath() diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index c6a20fce413..1ca0bd73df6 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class") @@ -40,84 +40,84 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt"); doTest(fileName); } @TestMetadata("DefaultConstructor.kt") public void testDefaultConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt"); doTest(fileName); } @TestMetadata("DefaultConstructorWithTwoArgs.kt") public void testDefaultConstructorWithTwoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt"); doTest(fileName); } @TestMetadata("ExtendsAbstractListT.kt") public void testExtendsAbstractListT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt"); doTest(fileName); } @TestMetadata("ImplementsListString.kt") public void testImplementsListString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt"); doTest(fileName); } @TestMetadata("ImplementsMapPP.kt") public void testImplementsMapPP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructors.kt") public void testInnerClassConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt"); doTest(fileName); } @TestMetadata("InnerClassOfGeneric.kt") public void testInnerClassOfGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt"); doTest(fileName); } @TestMetadata("kt3561.kt") public void testKt3561() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt"); doTest(fileName); } @TestMetadata("kt4050.kt") public void testKt4050() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/StarProjection.kt"); doTest(fileName); } } @@ -127,12 +127,12 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DefaultArgumentInEnumConstructor.kt") public void testDefaultArgumentInEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/enum/DefaultArgumentInEnumConstructor.kt"); doTest(fileName); } } @@ -143,143 +143,143 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg public static class Method extends AbstractCompileJavaAgainstKotlinTest { @TestMetadata("AccessorGenericSignature.kt") public void testAccessorGenericSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt"); doTest(fileName); } public void testAllFilesPresentInMethod() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") public void testAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Any.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Any.kt"); doTest(fileName); } @TestMetadata("ArrayOfIntArray.kt") public void testArrayOfIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt"); doTest(fileName); } @TestMetadata("ArrayOfIntegerArray.kt") public void testArrayOfIntegerArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt"); doTest(fileName); } @TestMetadata("ClashingSignaturesWithoutReturnType.kt") public void testClashingSignaturesWithoutReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt"); doTest(fileName); } @TestMetadata("Extensions.kt") public void testExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt"); doTest(fileName); } @TestMetadata("GenericArray.kt") public void testGenericArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt"); doTest(fileName); } @TestMetadata("Hello.kt") public void testHello() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt"); doTest(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Int.kt"); doTest(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt"); doTest(fileName); } @TestMetadata("IntWithDefault.kt") public void testIntWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt"); doTest(fileName); } @TestMetadata("IntegerArray.kt") public void testIntegerArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt"); doTest(fileName); } @TestMetadata("ListOfInt.kt") public void testListOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt"); doTest(fileName); } @TestMetadata("ListOfString.kt") public void testListOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt"); doTest(fileName); } @TestMetadata("ListOfT.kt") public void testListOfT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt"); doTest(fileName); } @TestMetadata("MapOfKString.kt") public void testMapOfKString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt"); doTest(fileName); } @TestMetadata("MapOfStringIntQ.kt") public void testMapOfStringIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt"); doTest(fileName); } @TestMetadata("QExtendsListString.kt") public void testQExtendsListString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt"); doTest(fileName); } @TestMetadata("QExtendsString.kt") public void testQExtendsString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt"); doTest(fileName); } @TestMetadata("TraitImpl.kt") public void testTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt"); doTest(fileName); } @TestMetadata("Vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt"); doTest(fileName); } @TestMetadata("Void.kt") public void testVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Void.kt"); doTest(fileName); } @@ -288,12 +288,12 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPlatformName() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PlatformName.kt") public void testPlatformName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt"); doTest(fileName); } } @@ -303,72 +303,72 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class PrimitiveOverride extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPrimitiveOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ByteOverridesObject.kt") public void testByteOverridesObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt"); doTest(fileName); } @TestMetadata("CallFinalNotInSubclass.kt") public void testCallFinalNotInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt"); doTest(fileName); } @TestMetadata("CallNotInSubclass.kt") public void testCallNotInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt"); doTest(fileName); } @TestMetadata("CovariantReturnTypeOverride.kt") public void testCovariantReturnTypeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt"); doTest(fileName); } @TestMetadata("FinalOverride.kt") public void testFinalOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt"); doTest(fileName); } @TestMetadata("IntOverridesComparable.kt") public void testIntOverridesComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt"); doTest(fileName); } @TestMetadata("IntOverridesNumber.kt") public void testIntOverridesNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt"); doTest(fileName); } @TestMetadata("IntOverridesObject.kt") public void testIntOverridesObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt"); doTest(fileName); } @TestMetadata("ManyClassesHierarchy.kt") public void testManyClassesHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt"); doTest(fileName); } @TestMetadata("NullableIntOverridesObject.kt") public void testNullableIntOverridesObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt"); doTest(fileName); } @TestMetadata("OverrideInJava.kt") public void testOverrideInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt"); doTest(fileName); } } @@ -378,48 +378,48 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Throws extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInThrows() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassMembers.kt") public void testClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt"); doTest(fileName); } @TestMetadata("DefaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt"); doTest(fileName); } @TestMetadata("GenericSubstitution.kt") public void testGenericSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt"); doTest(fileName); } @TestMetadata("TopLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt"); doTest(fileName); } @TestMetadata("TraitMembers.kt") public void testTraitMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt"); doTest(fileName); } } @@ -430,30 +430,30 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class PlatformStatic extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPlatformStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/platformStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleClassObject.kt") public void testSimpleClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObject.kt"); doTest(fileName); } @TestMetadata("simpleClassObjectProperty.kt") public void testSimpleClassObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleClassObjectProperty.kt"); doTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObject.kt"); doTest(fileName); } @TestMetadata("simpleObjectProperty.kt") public void testSimpleObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/platformStatic/simpleObjectProperty.kt"); doTest(fileName); } } @@ -463,24 +463,24 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstVal.kt") public void testConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/ConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/ConstVal.kt"); doTest(fileName); } @TestMetadata("Extensions.kt") public void testExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt"); doTest(fileName); } @TestMetadata("GenericProperty.kt") public void testGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt"); doTest(fileName); } @@ -489,12 +489,12 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPlatformName() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PlatformName.kt") public void testPlatformName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt"); doTest(fileName); } } @@ -505,18 +505,18 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Sealed extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInSealed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/sealed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/sealed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Derived.kt") public void testDerived() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/sealed/Derived.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/sealed/Derived.kt"); doTest(fileName); } @TestMetadata("Instance.kt") public void testInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/sealed/Instance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/sealed/Instance.kt"); doTest(fileName); } } @@ -526,36 +526,36 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class StaticFields extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInStaticFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationClass.kt") public void testAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt"); doTest(fileName); } @TestMetadata("AnnotationTrait.kt") public void testAnnotationTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt"); doTest(fileName); } @TestMetadata("kt3698.kt") public void testKt3698() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt"); doTest(fileName); } @TestMetadata("staticClassProperty.kt") public void testStaticClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt"); doTest(fileName); } @TestMetadata("staticTraitProperty.kt") public void testStaticTraitProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt"); doTest(fileName); } } @@ -565,84 +565,84 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @RunWith(JUnit3RunnerWithInners.class) public static class Targets extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInTargets() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/targets"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/targets"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/annotation.kt"); doTest(fileName); } @TestMetadata("base.kt") public void testBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/base.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/base.kt"); doTest(fileName); } @TestMetadata("classifier.kt") public void testClassifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/classifier.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/constructor.kt"); doTest(fileName); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/empty.kt"); doTest(fileName); } @TestMetadata("field.kt") public void testField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/field.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/field.kt"); doTest(fileName); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/function.kt"); doTest(fileName); } @TestMetadata("getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/getter.kt"); doTest(fileName); } @TestMetadata("local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/local.kt"); doTest(fileName); } @TestMetadata("multiple.kt") public void testMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/multiple.kt"); doTest(fileName); } @TestMetadata("parameter.kt") public void testParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/parameter.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/property.kt"); doTest(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/targets/setter.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index bfc7118cc86..910d2ae6ace 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -86,7 +86,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { Project project = createEnvironment(Arrays.asList(extraClassPath)).getProject(); AnalysisResult result = JvmResolveUtil.analyzeOneFileWithJavaIntegrationAndCheckForErrors( - JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) + KotlinTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) ); PackageViewDescriptor packageView = result.getModuleDescriptor().getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME); @@ -98,9 +98,9 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { private KotlinCoreEnvironment createEnvironment(@NotNull List extraClassPath) { List extras = new ArrayList(); extras.addAll(extraClassPath); - extras.add(JetTestUtils.getAnnotationsJar()); + extras.add(KotlinTestUtils.getAnnotationsJar()); - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, extras.toArray(new File[extras.size()])); return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); } @@ -142,7 +142,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { } public void testRawTypes() throws Exception { - JetTestUtils.compileJavaFiles( + KotlinTestUtils.compileJavaFiles( Collections.singletonList( new File(getTestDataDirectory() + "/library/test/A.java") ), @@ -169,7 +169,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { String outputMain = CliBaseTest.getNormalizedCompilerOutput(pair2.first, pair2.second, getTestDataDirectory().getPath()); - JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), outputLib + "\n" + outputMain); + KotlinTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), outputLib + "\n" + outputMain); } public void testDuplicateObjectInBinaryAndSources() throws Exception { @@ -199,7 +199,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { // This test checks that there are no PARAMETER_NAME_CHANGED_ON_OVERRIDE or DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES // warnings when subclassing in Kotlin from Java binaries (in case when no parameter names are available for Java classes) - JetTestUtils.compileJavaFiles( + KotlinTestUtils.compileJavaFiles( Collections.singletonList(getTestDataFileWithExtension("java")), Arrays.asList("-d", tmpdir.getPath()) ); @@ -207,7 +207,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { Project project = createEnvironment(Collections.singletonList(tmpdir)).getProject(); AnalysisResult result = JvmResolveUtil.analyzeOneFileWithJavaIntegration( - JetTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) + KotlinTestUtils.loadJetFile(project, getTestDataFileWithExtension("kt")) ); result.throwIfError(); @@ -221,7 +221,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { // This test compiles a Java library of two classes (Super and Sub), then deletes Super.class and attempts to compile a Kotlin // source against this broken library. The expected result is an "incomplete hierarchy" error message from the compiler - JetTestUtils.compileJavaFiles( + KotlinTestUtils.compileJavaFiles( Arrays.asList( new File(getTestDataDirectory() + "/library/test/Super.java"), new File(getTestDataDirectory() + "/library/test/Sub.java") @@ -241,7 +241,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { )); String output = CliBaseTest.getNormalizedCompilerOutput(pair.first, pair.second, getTestDataDirectory().getPath()); - JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output); + KotlinTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output); } public void testIncompleteHierarchyInKotlin() throws Exception { @@ -258,7 +258,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { )); String output = CliBaseTest.getNormalizedCompilerOutput(pair.first, pair.second, getTestDataDirectory().getPath()); - JetTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output); + KotlinTestUtils.assertEqualsToFile(new File(getTestDataDirectory(), "output.txt"), output); } /*test source mapping generation when source info is absent*/ diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java index 6a696f9a798..c8bd7af91bb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInBoxInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject") @@ -40,102 +40,102 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class AnonymousObject extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInAnonymousObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("anonymousObjectOnCallSite.1.kt") public void testAnonymousObjectOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt") public void testAnonymousObjectOnCallSiteSuperParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnDeclarationSite.1.kt") public void testAnonymousObjectOnDeclarationSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt") public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline.1.kt") public void testCapturedLambdaInInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline2.1.kt") public void testCapturedLambdaInInline2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInline3.1.kt") public void testCapturedLambdaInInline3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline3.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInline3.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedLambdaInInlineObject.1.kt") public void testCapturedLambdaInInlineObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/capturedLambdaInInlineObject.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("changingReturnType.1.kt") public void testChangingReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/changingReturnType.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/changingReturnType.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("constructorVisibility.1.kt") public void testConstructorVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibility.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibility.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("constructorVisibilityInConstLambda.1.kt") public void testConstructorVisibilityInConstLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInConstLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInConstLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("constructorVisibilityInLambda.1.kt") public void testConstructorVisibilityInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/constructorVisibilityInLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt6552.1.kt") public void testKt6552() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt6552.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt6552.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8133.1.kt") public void testKt8133() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt8133.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt8133.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt9064.1.kt") public void testKt9064() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt9064v2.1.kt") public void testKt9064v2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064v2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/kt9064v2.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -145,54 +145,54 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class ArgumentOrder extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInArgumentOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/argumentOrder"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/argumentOrder"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("captured.1.kt") public void testCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/captured.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/captured.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedInExtension.1.kt") public void testCapturedInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/capturedInExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/capturedInExtension.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extension.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("extensionInClass.1.kt") public void testExtensionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extensionInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/extensionInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaMigration.1.kt") public void testLambdaMigration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigration.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigration.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaMigrationInClass.1.kt") public void testLambdaMigrationInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigrationInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/lambdaMigrationInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simple.1.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simple.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleInClass.1.kt") public void testSimpleInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simpleInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/argumentOrder/simpleInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -202,18 +202,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Builders extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInBuilders() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("builders.1.kt") public void testBuilders() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("buildersAndLambdaCapturing.1.kt") public void testBuildersAndLambdaCapturing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -223,42 +223,42 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/callableReference"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/callableReference"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("classLevel.1.kt") public void testClassLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("classLevel2.1.kt") public void testClassLevel2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/classLevel2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("constructor.1.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/constructor.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/constructor.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intrinsic.1.kt") public void testIntrinsic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/intrinsic.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/intrinsic.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("topLevel.1.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevel.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevel.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("topLevelExtension.1.kt") public void testTopLevelExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevelExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/callableReference/topLevelExtension.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -268,42 +268,42 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Capture extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInCapture() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("captureInlinable.1.kt") public void testCaptureInlinable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("captureInlinableAndOther.1.kt") public void testCaptureInlinableAndOther() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("captureThisAndReceiver.1.kt") public void testCaptureThisAndReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("generics.1.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleCapturingInClass.1.kt") public void testSimpleCapturingInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleCapturingInPackage.1.kt") public void testSimpleCapturingInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -313,36 +313,36 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Complex extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInComplex() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("closureChain.1.kt") public void testClosureChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("forEachLine.1.kt") public void testForEachLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaInLambda.1.kt") public void testLambdaInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("use.1.kt") public void testUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("with.1.kt") public void testWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -352,48 +352,48 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValues extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInDefaultValues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("defaultInExtension.1.kt") public void testDefaultInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("defaultMethod.1.kt") public void testDefaultMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("defaultMethodInClass.1.kt") public void testDefaultMethodInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("defaultParamRemapping.1.kt") public void testDefaultParamRemapping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultParamRemapping.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("inlineInDefaultParameter.1.kt") public void testInlineInDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt5685.1.kt") public void testKt5685() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/kt5685.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/kt5685.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleDefaultMethod.1.kt") public void testSimpleDefaultMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -403,12 +403,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class FunctionExpression extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInFunctionExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/functionExpression"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/functionExpression"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/functionExpression/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/functionExpression/extension.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -418,18 +418,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class LambdaClassClash extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInLambdaClassClash() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaClassClash.1.kt") public void testLambdaClassClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaX2.1.kt") public void testNoInlineLambdaX2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -439,36 +439,36 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class LambdaTransformation extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInLambdaTransformation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaCloning.1.kt") public void testLambdaCloning() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaInLambda2.1.kt") public void testLambdaInLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaInLambdaNoInline.1.kt") public void testLambdaInLambdaNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("regeneratedLambdaName.1.kt") public void testRegeneratedLambdaName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("sameCaptured.1.kt") public void testSameCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -478,12 +478,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class LocalFunInLambda extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInLocalFunInLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("localFunInLambda.1.kt") public void testLocalFunInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -493,18 +493,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInModifiers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/modifiers"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/modifiers"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("packagePrivateMembers.1.kt") public void testPackagePrivateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/packagePrivateMembers.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("propertyModifiers.1.kt") public void testPropertyModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/propertyModifiers.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/modifiers/propertyModifiers.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -514,12 +514,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClasses extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInMultifileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/multifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/multifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("inlineFromOtherPackage.1.kt") public void testInlineFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/multifileClasses/inlineFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/multifileClasses/inlineFromOtherPackage.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -529,42 +529,42 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class NoInline extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInNoInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambdaAsGeneric.1.kt") public void testLambdaAsGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsGeneric.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsGeneric.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaAsNonFunction.1.kt") public void testLambdaAsNonFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsNonFunction.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/lambdaAsNonFunction.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noInline.1.kt") public void testNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaChain.1.kt") public void testNoInlineLambdaChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt") public void testNoInlineLambdaChainWithCapturedInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("withoutInline.1.kt") public void testWithoutInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -574,84 +574,84 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("explicitLocalReturn.1.kt") public void testExplicitLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("justReturnInLambda.1.kt") public void testJustReturnInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt5199.1.kt") public void testKt5199() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt5199.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt5199.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8948.1.kt") public void testKt8948() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8948v2.1.kt") public void testKt8948v2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948v2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/kt8948v2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nestedNonLocals.1.kt") public void testNestedNonLocals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noInlineLocalReturn.1.kt") public void testNoInlineLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nonLocalReturnFromOuterLambda.1.kt") public void testNonLocalReturnFromOuterLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nonLocalReturnFromOuterLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nonLocalReturnFromOuterLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("propertyAccessors.1.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("returnFromFunctionExpr.1.kt") public void testReturnFromFunctionExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/returnFromFunctionExpr.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/returnFromFunctionExpr.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simple.1.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleFunctional.1.kt") public void testSimpleFunctional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleFunctional.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleFunctional.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleVoid.1.kt") public void testSimpleVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt"); doBoxTestWithInlineCheck(fileName); } @@ -660,18 +660,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Deparenthesize extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInDeparenthesize() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("bracket.1.kt") public void testBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("labeled.1.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -681,24 +681,24 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInTryFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt6956.1.kt") public void testKt6956() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt6956.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt7273.1.kt") public void testKt7273() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt7273.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/kt7273.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nonLocalReturnFromOuterLambda.1.kt") public void testNonLocalReturnFromOuterLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/nonLocalReturnFromOuterLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @@ -707,42 +707,42 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class CallSite extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInCallSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("callSite.1.kt") public void testCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("callSiteComplex.1.kt") public void testCallSiteComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSiteComplex.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("exceptionTableSplit.1.kt") public void testExceptionTableSplit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplit.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("exceptionTableSplitNoReturn.1.kt") public void testExceptionTableSplitNoReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/exceptionTableSplitNoReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("finallyInFinally.1.kt") public void testFinallyInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/finallyInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/finallyInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("wrongVarInterval.1.kt") public void testWrongVarInterval() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/wrongVarInterval.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/wrongVarInterval.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -752,54 +752,54 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Chained extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInChained() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("finallyInFinally.1.kt") public void testFinallyInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("finallyInFinally2.1.kt") public void testFinallyInFinally2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/finallyInFinally2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturn.1.kt") public void testIntReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturnComplex.1.kt") public void testIntReturnComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturnComplex2.1.kt") public void testIntReturnComplex2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturnComplex3.1.kt") public void testIntReturnComplex3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex3.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturnComplex4.1.kt") public void testIntReturnComplex4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/intReturnComplex4.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nestedLambda.1.kt") public void testNestedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/nestedLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/chained/nestedLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -809,78 +809,78 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class DeclSite extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInDeclSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("complex.1.kt") public void testComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturn.1.kt") public void testIntReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("intReturnComplex.1.kt") public void testIntReturnComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/intReturnComplex.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("longReturn.1.kt") public void testLongReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/longReturn.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nested.1.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/nested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/nested.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("returnInFinally.1.kt") public void testReturnInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("returnInTry.1.kt") public void testReturnInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTry.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTry.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("returnInTryAndFinally.1.kt") public void testReturnInTryAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTryAndFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTryAndFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("severalInTry.1.kt") public void testSeveralInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTry.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTry.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("severalInTryComplex.1.kt") public void testSeveralInTryComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTryComplex.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/severalInTryComplex.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("voidInlineFun.1.kt") public void testVoidInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidInlineFun.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidInlineFun.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("voidNonLocal.1.kt") public void testVoidNonLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidNonLocal.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/voidNonLocal.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -890,102 +890,102 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class ExceptionTable extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInExceptionTable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("break.1.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/break.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/break.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("continue.1.kt") public void testContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/continue.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/continue.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("exceptionInFinally.1.kt") public void testExceptionInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/exceptionInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("forInFinally.1.kt") public void testForInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/forInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/forInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("innerAndExternal.1.kt") public void testInnerAndExternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternal.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("innerAndExternalNested.1.kt") public void testInnerAndExternalNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalNested.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("innerAndExternalSimple.1.kt") public void testInnerAndExternalSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/innerAndExternalSimple.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nested.1.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nested.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nestedWithReturns.1.kt") public void testNestedWithReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturns.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("nestedWithReturnsSimple.1.kt") public void testNestedWithReturnsSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/nestedWithReturnsSimple.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("noFinally.1.kt") public void testNoFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/noFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("severalCatchClause.1.kt") public void testSeveralCatchClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/severalCatchClause.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleThrow.1.kt") public void testSimpleThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/simpleThrow.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("synchonized.1.kt") public void testSynchonized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/synchonized.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/synchonized.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("throwInFinally.1.kt") public void testThrowInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/throwInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("tryCatchInFinally.1.kt") public void testTryCatchInFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/exceptionTable/tryCatchInFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -995,12 +995,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt7792.1.kt") public void testKt7792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/variables/kt7792.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1013,47 +1013,47 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi public static class Private extends AbstractCompileKotlinAgainstInlineKotlinTest { @TestMetadata("accessorStability.1.kt") public void testAccessorStability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStability.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("accessorStabilityInClass.1.kt") public void testAccessorStabilityInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStabilityInClass.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/accessorStabilityInClass.1.kt"); doBoxTestWithInlineCheck(fileName); } public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/private"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/private"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt6453.1.kt") public void testKt6453() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt6453.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt6453.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8094.1.kt") public void testKt8094() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8094.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8094.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8095.1.kt") public void testKt8095() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8095.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/kt8095.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("privateInInlineInMultiFileFacade.1.kt") public void testPrivateInInlineInMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInInlineInMultiFileFacade.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInInlineInMultiFileFacade.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("privateInline.1.kt") public void testPrivateInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInline.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/private/privateInline.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1063,66 +1063,66 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Reified extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInReified() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/reified"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/reified"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("capturedLambda.1.kt") public void testCapturedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("capturedLambda2.1.kt") public void testCapturedLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/capturedLambda2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt6988.1.kt") public void testKt6988() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt6988_2.1.kt") public void testKt6988_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988_2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6988_2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt6990.1.kt") public void testKt6990() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6990.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt6990.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt7017.1.kt") public void testKt7017() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt7017.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt7017.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt8047.1.kt") public void testKt8047() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt8047.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt8047.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt9637.1.kt") public void testKt9637() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("kt9637_2.1.kt") public void testKt9637_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637_2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/kt9637_2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("packages.1.kt") public void testPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/packages.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/reified/packages.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1132,90 +1132,90 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Simple extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInSimple() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("classObject.1.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("extension.1.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("extensionLambda.1.kt") public void testExtensionLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extensionLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extensionLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("params.1.kt") public void testParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("rootConstructor.1.kt") public void testRootConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("severalClosures.1.kt") public void testSeveralClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("severalUsage.1.kt") public void testSeveralUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleDouble.1.kt") public void testSimpleDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleEnum.1.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleGenerics.1.kt") public void testSimpleGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleInt.1.kt") public void testSimpleInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleLambda.1.kt") public void testSimpleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("simpleObject.1.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("vararg.1.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1225,24 +1225,24 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Smap extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInSmap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("assertion.1.kt") public void testAssertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/assertion.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/assertion.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("oneFile.1.kt") public void testOneFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/oneFile.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/oneFile.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("smap.1.kt") public void testSmap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/smap.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/smap.1.kt"); doBoxTestWithInlineCheck(fileName); } @@ -1251,54 +1251,54 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Anonymous extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInAnonymous() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/anonymous"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/anonymous"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("lambda.1.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambda.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaOnCallSite.1.kt") public void testLambdaOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("lambdaOnInlineCallSite.1.kt") public void testLambdaOnInlineCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("object.1.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/object.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("objectOnCallSite.1.kt") public void testObjectOnCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSite.1.kt") public void testObjectOnInlineCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSite2.1.kt") public void testObjectOnInlineCallSite2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("objectOnInlineCallSiteWithCapture.1.kt") public void testObjectOnInlineCallSiteWithCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1308,18 +1308,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Resolve extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/resolve"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/smap/resolve"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("inlineComponent.1.kt") public void testInlineComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("inlineIterator.1.kt") public void testInlineIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1330,42 +1330,42 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Special extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInSpecial() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("identityCheck.1.kt") public void testIdentityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("ifBranches.1.kt") public void testIfBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("iinc.1.kt") public void testIinc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("inlineChain.1.kt") public void testInlineChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("plusAssign.1.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("stackHeightBug.1.kt") public void testStackHeightBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1375,12 +1375,12 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class Trait extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("trait.1.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt"); doBoxTestWithInlineCheck(fileName); } } @@ -1390,30 +1390,30 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @RunWith(JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("kt5863.1.kt") public void testKt5863() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/kt5863.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/kt5863.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("tryCatch.1.kt") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("tryCatch2.1.kt") public void testTryCatch2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt"); doBoxTestWithInlineCheck(fileName); } @TestMetadata("tryCatchFinally.1.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt"); doBoxTestWithInlineCheck(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index 99b64eeff34..b8ae632df71 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,168 +32,168 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true); } @TestMetadata("AnnotationInTrait.A.kt") public void testAnnotationInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/AnnotationInTrait.A.kt"); doTest(fileName); } @TestMetadata("ClassInObject.A.kt") public void testClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt"); doTest(fileName); } @TestMetadata("ClassObjectInEnum.A.kt") public void testClassObjectInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectInEnum.A.kt"); doTest(fileName); } @TestMetadata("ClassObjectMember.A.kt") public void testClassObjectMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt"); doTest(fileName); } @TestMetadata("ConstructorVararg.A.kt") public void testConstructorVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt"); doTest(fileName); } @TestMetadata("DefaultConstructor.A.kt") public void testDefaultConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt"); doTest(fileName); } @TestMetadata("DoublyNestedClass.A.kt") public void testDoublyNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt"); doTest(fileName); } @TestMetadata("Enum.A.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt"); doTest(fileName); } @TestMetadata("ImportObject.A.kt") public void testImportObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt"); doTest(fileName); } @TestMetadata("InlinedConstants.A.kt") public void testInlinedConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructor.A.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt"); doTest(fileName); } @TestMetadata("jvmField.A.kt") public void testJvmField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmField.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/jvmField.A.kt"); doTest(fileName); } @TestMetadata("JvmNameOnAccessor.A.kt") public void testJvmNameOnAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/JvmNameOnAccessor.A.kt"); doTest(fileName); } @TestMetadata("KotlinPropertyAsAnnotationParameter.A.kt") public void testKotlinPropertyAsAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt"); doTest(fileName); } @TestMetadata("MultifileClassInlineFunctionAccessingProperty.A.kt") public void testMultifileClassInlineFunctionAccessingProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/MultifileClassInlineFunctionAccessingProperty.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/MultifileClassInlineFunctionAccessingProperty.A.kt"); doTest(fileName); } @TestMetadata("NestedClass.A.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt"); doTest(fileName); } @TestMetadata("NestedEnum.A.kt") public void testNestedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt"); doTest(fileName); } @TestMetadata("NestedObject.A.kt") public void testNestedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt"); doTest(fileName); } @TestMetadata("PlatformNames.A.kt") public void testPlatformNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt"); doTest(fileName); } @TestMetadata("PlatformStaticInObject.A.kt") public void testPlatformStaticInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformStaticInObject.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformStaticInObject.A.kt"); doTest(fileName); } @TestMetadata("PlatformTypes.A.kt") public void testPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformTypes.A.kt"); doTest(fileName); } @TestMetadata("PropertyReference.A.kt") public void testPropertyReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt"); doTest(fileName); } @TestMetadata("RecursiveGeneric.A.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/RecursiveGeneric.A.kt"); doTest(fileName); } @TestMetadata("SecondaryConstructors.A.kt") public void testSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/SecondaryConstructors.A.kt"); doTest(fileName); } @TestMetadata("Simple.A.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt"); doTest(fileName); } @TestMetadata("SimpleValAnonymousObject.A.kt") public void testSimpleValAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/SimpleValAnonymousObject.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/SimpleValAnonymousObject.A.kt"); doTest(fileName); } @TestMetadata("StarImportEnum.A.kt") public void testStarImportEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstMultifileKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstMultifileKotlinTestGenerated.java index b4443fc2478..449bb1a2a72 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstMultifileKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstMultifileKotlinTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompileKotlinAgainstMultifileKotlinTestGenerated extends AbstractCompileKotlinAgainstMultifileKotlinTest { public void testAllFilesPresentInBoxMultifileClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxMultifileClasses/calls") @@ -40,24 +40,24 @@ public class CompileKotlinAgainstMultifileKotlinTestGenerated extends AbstractCo @RunWith(JUnit3RunnerWithInners.class) public static class Calls extends AbstractCompileKotlinAgainstMultifileKotlinTest { public void testAllFilesPresentInCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses/calls"), Pattern.compile("^(.+)\\.1.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxMultifileClasses/calls"), Pattern.compile("^(.+)\\.1.kt$"), true); } @TestMetadata("callFromOtherPackage.1.kt") public void testCallFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/callFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/callFromOtherPackage.1.kt"); doBoxTest(fileName); } @TestMetadata("valFromOtherPackage.1.kt") public void testValFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/valFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/valFromOtherPackage.1.kt"); doBoxTest(fileName); } @TestMetadata("varFromOtherPackage.1.kt") public void testVarFromOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/varFromOtherPackage.1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/boxMultifileClasses/calls/varFromOtherPackage.1.kt"); doBoxTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java index 47f9c25cb66..e3b966b0602 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java @@ -29,14 +29,12 @@ import com.intellij.openapi.vfs.VirtualFileVisitor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys; 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.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; -import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.HashSet; @@ -68,8 +66,8 @@ public class JdkAnnotationsValidityTest extends AbstractSdkAnnotationsValidityTe private static final Set classesToIgnore = new HashSet(Arrays.asList("javax.management.openmbean.TabularDataSupport")); private static KotlinCoreEnvironment createFullJdkEnvironment(Disposable parentDisposable) { - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK, JetTestUtils.getAnnotationsJar() + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( + ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK, KotlinTestUtils.getAnnotationsJar() ); // TODO: move this test to idea-tests and re-implement it for ExternalAnnotationsManagerImpl // configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File("ideaSDK/lib/jdkAnnotations.jar")); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt index dbe2fbec74f..e9e12eb2153 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement import org.jetbrains.kotlin.test.TestJdkKind import java.io.File @@ -36,7 +36,7 @@ import kotlin.test.assertTrue public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { fun testAbsentClass() { - val tmpdir = JetTestUtils.tmpDirForTest(this) + val tmpdir = KotlinTestUtils.tmpDirForTest(this) val environment = createEnvironment(tmpdir) val project = environment.project @@ -47,8 +47,8 @@ public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { } fun testNestedClass() { - val tmpdir = JetTestUtils.tmpDirForTest(this) - JetTestUtils.compileKotlinWithJava( + val tmpdir = KotlinTestUtils.tmpDirForTest(this) + KotlinTestUtils.compileKotlinWithJava( listOf(), listOf(File("compiler/testData/kotlinClassFinder/nestedClass.kt")), tmpdir, getTestRootDisposable()!!, null ) @@ -68,7 +68,7 @@ public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { private fun createEnvironment(tmpdir: File?): KotlinCoreEnvironment { val environment = KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, - JetTestUtils.compilerConfigurationForTests( + KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), EnvironmentConfigFiles.JVM_CONFIG_FILES) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index f847b4e40a5..5db6e580303 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -42,14 +42,14 @@ import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; import java.io.IOException; import java.util.*; -import static org.jetbrains.kotlin.test.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations; +import static org.jetbrains.kotlin.test.KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations; public final class LoadDescriptorUtil { @@ -67,9 +67,10 @@ public final class LoadDescriptorUtil { @NotNull ConfigurationKind configurationKind, boolean useTypeTableInSerializer ) { - JetFilesAndAnalysisResult filesAndResult = JetFilesAndAnalysisResult.createJetFilesAndAnalyze(kotlinFiles, disposable, configurationKind); + KtFilesAndAnalysisResult + filesAndResult = KtFilesAndAnalysisResult.createJetFilesAndAnalyze(kotlinFiles, disposable, configurationKind); AnalysisResult result = filesAndResult.getAnalysisResult(); - List files = filesAndResult.getJetFiles(); + List files = filesAndResult.getKtFiles(); GenerationState state = GenerationUtils.compileFilesGetGenerationState( files.get(0).getProject(), result, files, useTypeTableInSerializer ); @@ -86,7 +87,7 @@ public final class LoadDescriptorUtil { boolean isBinaryRoot ) { List javaBinaryRoots = new ArrayList(); - javaBinaryRoots.add(JetTestUtils.getAnnotationsJar()); + javaBinaryRoots.add(KotlinTestUtils.getAnnotationsJar()); List javaSourceRoots = new ArrayList(); javaSourceRoots.add(new File("compiler/testData/loadJava/include")); @@ -96,7 +97,7 @@ public final class LoadDescriptorUtil { else { javaSourceRoots.add(javaRoot); } - CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( configurationKind, testJdkKind, javaBinaryRoots, @@ -115,17 +116,17 @@ public final class LoadDescriptorUtil { public static void compileJavaWithAnnotationsJar(@NotNull Collection javaFiles, @NotNull File outDir) throws IOException { String classPath = ForTestCompileRuntime.runtimeJarForTests() + File.pathSeparator + - JetTestUtils.getAnnotationsJar().getPath(); - JetTestUtils.compileJavaFiles(javaFiles, Arrays.asList( + KotlinTestUtils.getAnnotationsJar().getPath(); + KotlinTestUtils.compileJavaFiles(javaFiles, Arrays.asList( "-classpath", classPath, "-sourcepath", "compiler/testData/loadJava/include", "-d", outDir.getPath() )); } - private static class JetFilesAndAnalysisResult { + private static class KtFilesAndAnalysisResult { @NotNull - public static JetFilesAndAnalysisResult createJetFilesAndAnalyze( + public static KtFilesAndAnalysisResult createJetFilesAndAnalyze( @NotNull List kotlinFiles, @NotNull Disposable disposable, @NotNull ConfigurationKind configurationKind @@ -135,7 +136,7 @@ public final class LoadDescriptorUtil { @Override public KtFile fun(File kotlinFile) { try { - return JetTestUtils.createFile( + return KotlinTestUtils.createFile( kotlinFile.getName(), FileUtil.loadFile(kotlinFile, true), jetCoreEnvironment.getProject()); } catch (IOException e) { @@ -145,20 +146,20 @@ public final class LoadDescriptorUtil { }); AnalysisResult result = JvmResolveUtil.analyzeFilesWithJavaIntegrationAndCheckForErrors( jetCoreEnvironment.getProject(), jetFiles, new JvmPackagePartProvider(jetCoreEnvironment)); - return new JetFilesAndAnalysisResult(jetFiles, result); + return new KtFilesAndAnalysisResult(jetFiles, result); } - private final List jetFiles; + private final List ktFiles; private final AnalysisResult result; - private JetFilesAndAnalysisResult(@NotNull List jetFiles, @NotNull AnalysisResult result) { - this.jetFiles = jetFiles; + private KtFilesAndAnalysisResult(@NotNull List ktFiles, @NotNull AnalysisResult result) { + this.ktFiles = ktFiles; this.result = result; } @NotNull - public List getJetFiles() { - return jetFiles; + public List getKtFiles() { + return ktFiles; } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index b674c484046..5e55dbabfc5 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,258 +34,258 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJava extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArrayTypeVariance.java") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.java") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithConstVal.java") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypeP.java") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.java") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypePP.java") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypePRefNext.java") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypePRefSelf.java") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.java") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java"); doTestCompiledJava(fileName); } @TestMetadata("FieldAsVar.java") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldAsVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldAsVar.java"); doTestCompiledJava(fileName); } @TestMetadata("FieldOfArrayType.java") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java"); doTestCompiledJava(fileName); } @TestMetadata("FinalFieldAsVal.java") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.java") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.java") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java"); doTestCompiledJava(fileName); } @TestMetadata("InnerClass.java") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClass.java"); doTestCompiledJava(fileName); } @TestMetadata("InnerClassReferencesOuterTP.java") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java"); doTestCompiledJava(fileName); } @TestMetadata("InnerClassesInGeneric.java") public void testInnerClassesInGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java"); doTestCompiledJava(fileName); } @TestMetadata("InnerOfGeneric.java") public void testInnerOfGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java"); doTestCompiledJava(fileName); } @TestMetadata("IntrinsicCompanionObject.java") public void testIntrinsicCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodReferencesOuterClassTP.java") public void testMethodReferencesOuterClassTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodTypePOneUpperBound.java") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.java") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithTypeP.java") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithTypePP.java") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithTypePRefClassP.java") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java"); doTestCompiledJava(fileName); } @TestMetadata("MethosWithPRefTP.java") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java"); doTestCompiledJava(fileName); } @TestMetadata("MyException.java") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MyException.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MyException.java"); doTestCompiledJava(fileName); } @TestMetadata("NestedClass.java") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/NestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/NestedClass.java"); doTestCompiledJava(fileName); } @TestMetadata("OverrideMethod.java") public void testOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/OverrideMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/OverrideMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("PackageLocalVisibility.java") public void testPackageLocalVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java"); doTestCompiledJava(fileName); } @TestMetadata("PrivateMembers.java") public void testPrivateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembers.java"); doTestCompiledJava(fileName); } @TestMetadata("PrivateMembersInHierarchy.java") public void testPrivateMembersInHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java"); doTestCompiledJava(fileName); } @TestMetadata("RawTypeWithUpperBound.java") public void testRawTypeWithUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RawUpperBound.java") public void testRawUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RecursiveRawUpperBound.java") public void testRecursiveRawUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RecursiveWildcardUpperBound.java") public void testRecursiveWildcardUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RemoveRedundantProjectionKind.java") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/Simple.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassFromNested.java") public void testSubclassFromNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/SubclassFromNested.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/SubclassFromNested.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoFields.java") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/TwoFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/TwoFields.java"); doTestCompiledJava(fileName); } @TestMetadata("UnboundWildcard.java") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/UnboundWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/UnboundWildcard.java"); doTestCompiledJava(fileName); } @TestMetadata("WildcardBounds.java") public void testWildcardBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/WildcardBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/WildcardBounds.java"); doTestCompiledJava(fileName); } @@ -294,186 +294,186 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotatedAnnotation.java") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotatedConstructor.java") public void testAnnotatedConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotatedField.java") public void testAnnotatedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotatedMethod.java") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotatedValueParameter.java") public void testAnnotatedValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotationInParam.java") public void testAnnotationInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotationRetentions.java") public void testAnnotationRetentions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.java"); doTestCompiledJava(fileName); } @TestMetadata("AnnotationTargets.java") public void testAnnotationTargets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.java"); doTestCompiledJava(fileName); } @TestMetadata("ArithmeticExpressionInParam.java") public void testArithmeticExpressionInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("ArrayOfEnumInParam.java") public void testArrayOfEnumInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("ArrayOfStringInParam.java") public void testArrayOfStringInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassObjectArrayInParam.java") public void testClassObjectArrayInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassObjectInParam.java") public void testClassObjectInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassObjectInParamRaw.java") public void testClassObjectInParamRaw() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.java"); doTestCompiledJava(fileName); } @TestMetadata("ClassObjectInParamVariance.java") public void testClassObjectInParamVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.java"); doTestCompiledJava(fileName); } @TestMetadata("CustomAnnotation.java") public void testCustomAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java"); doTestCompiledJava(fileName); } @TestMetadata("CustomAnnotationWithDefaultParameter.java") public void testCustomAnnotationWithDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("EmptyArrayInParam.java") public void testEmptyArrayInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("EnumArgumentWithCustomToString.java") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.java"); doTestCompiledJava(fileName); } @TestMetadata("EnumConstructorParameter.java") public void testEnumConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("EnumInParam.java") public void testEnumInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaDocDeprecated.java") public void testJavaDocDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.java"); doTestCompiledJava(fileName); } @TestMetadata("NestedEnumArgument.java") public void testNestedEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.java"); doTestCompiledJava(fileName); } @TestMetadata("PrimitiveValueInParam.java") public void testPrimitiveValueInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("RecursiveAnnotation.java") public void testRecursiveAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java"); doTestCompiledJava(fileName); } @TestMetadata("RecursiveAnnotation2.java") public void testRecursiveAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java"); doTestCompiledJava(fileName); } @TestMetadata("SimpleAnnotation.java") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java"); doTestCompiledJava(fileName); } @TestMetadata("StringConcatenationInParam.java") public void testStringConcatenationInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("StringConstantInParam.java") public void testStringConstantInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java"); doTestCompiledJava(fileName); } @TestMetadata("StringInParam.java") public void testStringInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java"); doTestCompiledJava(fileName); } } @@ -483,24 +483,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConstructorGenericDeep.java") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorGenericSimple.java") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorGenericUpperBound.java") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java"); doTestCompiledJava(fileName); } } @@ -510,24 +510,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractLoadJavaTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/enum"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("EnumMembers.java") public void testEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumMembers.java"); doTestCompiledJava(fileName); } @TestMetadata("EnumWithSpecializedEntry.java") public void testEnumWithSpecializedEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaEnum.java") public void testJavaEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/JavaEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/JavaEnum.java"); doTestCompiledJava(fileName); } } @@ -537,42 +537,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("DifferentGetterAndSetter.java") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaBeanAbstractGetter.java") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaBeanVal.java") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaBeanVar.java") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java"); doTestCompiledJava(fileName); } @TestMetadata("JavaBeanVarOfGenericType.java") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSetters.java") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java"); doTestCompiledJava(fileName); } } @@ -583,101 +583,101 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.java") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java"); doTestCompiledJava(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArrayType.java") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorWithNewTypeParams.java") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorWithParentTypeParams.java") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorWithSeveralParams.java") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorWithoutParams.java") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java"); doTestCompiledJava(fileName); } @TestMetadata("CustomProjectionKind.java") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithFunctionTypes.java") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithGenerics.java") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithMappedClasses.java") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithTypeParameters.java") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodWithVararg.java") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java"); doTestCompiledJava(fileName); } @TestMetadata("PropertyArrayTypes.java") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java"); doTestCompiledJava(fileName); } @TestMetadata("PropertyComplexTypes.java") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java"); doTestCompiledJava(fileName); } @TestMetadata("PropertySimpleType.java") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java"); doTestCompiledJava(fileName); } @TestMetadata("StarProjection.java") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java"); doTestCompiledJava(fileName); } @@ -687,167 +687,167 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class Error extends AbstractLoadJavaTest { @TestMetadata("AddingNullability.java") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java"); doTestCompiledJava(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConflictingProjectionKind.java") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.java") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); doTestCompiledJava(fileName); } @TestMetadata("ExtraUpperBound.java") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("MissingUpperBound.java") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("NoFieldTypeRef.java") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java"); doTestCompiledJava(fileName); } @TestMetadata("NotVarargReplacedWithVararg.java") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java"); doTestCompiledJava(fileName); } @TestMetadata("RedundantProjectionKind.java") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("ReturnTypeMissing.java") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java"); doTestCompiledJava(fileName); } @TestMetadata("SyntaxError.java") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java"); doTestCompiledJava(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.java") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); doTestCompiledJava(fileName); } @TestMetadata("VarargReplacedWithNotVararg.java") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongFieldInitializer.java") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongFieldMutability.java") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongFieldName.java") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongMethodName.java") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongProjectionKind.java") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongReturnTypeStructure.java") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeName1.java") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeName2.java") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeName3.java") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.java") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.java") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongTypeParametersCount.java") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongValueParameterStructure1.java") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongValueParameterStructure2.java") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java"); doTestCompiledJava(fileName); } @TestMetadata("WrongValueParametersCount.java") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java"); doTestCompiledJava(fileName); } } @@ -857,12 +857,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PropagateTypeArgumentNullable.java") public void testPropagateTypeArgumentNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java"); doTestCompiledJava(fileName); } @@ -871,162 +871,162 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLoadJavaTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ChangeProjectionKind1.java") public void testChangeProjectionKind1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java"); doTestCompiledJava(fileName); } @TestMetadata("ChangeProjectionKind2.java") public void testChangeProjectionKind2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java"); doTestCompiledJava(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.java") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.java") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritMutability.java") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNotVararg.java") public void testInheritNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNotVarargInteger.java") public void testInheritNotVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNotVarargNotNull.java") public void testInheritNotVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNotVarargPrimitive.java") public void testInheritNotVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullability.java") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritProjectionKind.java") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritReadOnliness.java") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritVararg.java") public void testInheritVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritVarargInteger.java") public void testInheritVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritVarargNotNull.java") public void testInheritVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritVarargPrimitive.java") public void testInheritVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java"); doTestCompiledJava(fileName); } @TestMetadata("Kt3302.java") public void testKt3302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java"); doTestCompiledJava(fileName); } @TestMetadata("MutableToReadOnly.java") public void testMutableToReadOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java"); doTestCompiledJava(fileName); } @TestMetadata("NotNullToNullable.java") public void testNotNullToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java"); doTestCompiledJava(fileName); } @TestMetadata("NullableToNotNull.java") public void testNullableToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java"); doTestCompiledJava(fileName); } @TestMetadata("NullableToNotNullKotlinSignature.java") public void testNullableToNotNullKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java"); doTestCompiledJava(fileName); } @TestMetadata("OverrideWithErasedParameter.java") public void testOverrideWithErasedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("ReadOnlyToMutable.java") public void testReadOnlyToMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassFromGenericAndNot.java") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedClassParameter.java") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedClassParameters.java") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java"); doTestCompiledJava(fileName); } } @@ -1037,209 +1037,209 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class Return extends AbstractLoadJavaTest { @TestMetadata("AddNotNullJavaSubtype.java") public void testAddNotNullJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java"); doTestCompiledJava(fileName); } @TestMetadata("AddNotNullSameJavaType.java") public void testAddNotNullSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java"); doTestCompiledJava(fileName); } @TestMetadata("AddNullabilityJavaSubtype.java") public void testAddNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java"); doTestCompiledJava(fileName); } @TestMetadata("AddNullabilitySameGenericType1.java") public void testAddNullabilitySameGenericType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java"); doTestCompiledJava(fileName); } @TestMetadata("AddNullabilitySameGenericType2.java") public void testAddNullabilitySameGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java"); doTestCompiledJava(fileName); } @TestMetadata("AddNullabilitySameJavaType.java") public void testAddNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java"); doTestCompiledJava(fileName); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("CantMakeImmutableInSubclass.java") public void testCantMakeImmutableInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java"); doTestCompiledJava(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.java") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.java") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java"); doTestCompiledJava(fileName); } @TestMetadata("HalfSubstitutedTypeParameters.java") public void testHalfSubstitutedTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullabilityGenericSubclassSimple.java") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullabilityJavaSubtype.java") public void testInheritNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullabilitySameGenericType.java") public void testInheritNullabilitySameGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullabilitySameJavaType.java") public void testInheritNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritProjectionKind.java") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritReadOnlinessOfArgument.java") public void testInheritReadOnlinessOfArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritReadOnlinessSameClass.java") public void testInheritReadOnlinessSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritReadOnlinessSubclass.java") public void testInheritReadOnlinessSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java"); doTestCompiledJava(fileName); } @TestMetadata("SameProjectionKind.java") public void testSameProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassFromGenericAndNot.java") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassOfCollection.java") public void testSubclassOfCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassOfMapEntry.java") public void testSubclassOfMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedClassParameter.java") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedClassParameters.java") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.java") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.java") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.java") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesMutableAndNot.java") public void testTwoSuperclassesMutableAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.java") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesReturnSameJavaType.java") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesSupplementNotNull.java") public void testTwoSuperclassesSupplementNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParamOfClass.java") public void testTypeParamOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParamOfClassSubstituted.java") public void testTypeParamOfClassSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParamOfFun.java") public void testTypeParamOfFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java"); doTestCompiledJava(fileName); } } @@ -1249,60 +1249,60 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLoadJavaTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("InheritMutability.java") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritNullability.java") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritReadOnliness.java") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoBounds.java") public void testTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclasses.java") public void testTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoTypeParameters.java") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("UseParameterAsUpperBound.java") public void testUseParameterAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("UseParameterInUpperBound.java") public void testUseParameterInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java"); doTestCompiledJava(fileName); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.java") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java"); doTestCompiledJava(fileName); } } @@ -1314,24 +1314,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractLoadJavaTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("LoadIterable.java") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterable.java"); doTestCompiledJava(fileName); } @TestMetadata("LoadIterator.java") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterator.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterator.java"); doTestCompiledJava(fileName); } @TestMetadata("Max.java") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/Max.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/Max.java"); doTestCompiledJava(fileName); } } @@ -1341,12 +1341,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ModalityOfFakeOverrides.java") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java"); doTestCompiledJava(fileName); } } @@ -1356,36 +1356,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Mutability extends AbstractLoadJavaTest { public void testAllFilesPresentInMutability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("LoadIterable.java") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java"); doTestCompiledJava(fileName); } @TestMetadata("LoadIterableWithConflict.java") public void testLoadIterableWithConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java"); doTestCompiledJava(fileName); } @TestMetadata("LoadIterableWithNullability.java") public void testLoadIterableWithNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java"); doTestCompiledJava(fileName); } @TestMetadata("LoadIterableWithPropagation.java") public void testLoadIterableWithPropagation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java"); doTestCompiledJava(fileName); } @TestMetadata("ReadOnlyExtendsWildcard.java") public void testReadOnlyExtendsWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.java"); doTestCompiledJava(fileName); } } @@ -1395,36 +1395,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("NotNullField.java") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java"); doTestCompiledJava(fileName); } @TestMetadata("NotNullIntArray.java") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java"); doTestCompiledJava(fileName); } @TestMetadata("NotNullMethod.java") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("NotNullObjectArray.java") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java"); doTestCompiledJava(fileName); } @TestMetadata("NotNullParameter.java") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java"); doTestCompiledJava(fileName); } } @@ -1434,24 +1434,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedPackage extends AbstractLoadJavaTest { public void testAllFilesPresentInProtectedPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ProtectedPackageConstructor.java") public void testProtectedPackageConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java"); doTestCompiledJava(fileName); } @TestMetadata("ProtectedPackageFun.java") public void testProtectedPackageFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java"); doTestCompiledJava(fileName); } @TestMetadata("ProtectedPackageProperty.java") public void testProtectedPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java"); doTestCompiledJava(fileName); } } @@ -1461,12 +1461,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedStatic extends AbstractLoadJavaTest { public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConstructorInProtectedStaticNestedClass.java") public void testConstructorInProtectedStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java"); doTestCompiledJava(fileName); } } @@ -1476,12 +1476,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Rendering extends AbstractLoadJavaTest { public void testAllFilesPresentInRendering() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/rendering"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/rendering"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Rendering.java") public void testRendering() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/rendering/Rendering.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/rendering/Rendering.java"); doTestCompiledJava(fileName); } } @@ -1491,84 +1491,84 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Sam extends AbstractLoadJavaTest { public void testAllFilesPresentInSam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Comparator.java") public void testComparator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Comparator.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Comparator.java"); doTestCompiledJava(fileName); } @TestMetadata("FilenameFilter.java") public void testFilenameFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java"); doTestCompiledJava(fileName); } @TestMetadata("GenericInterfaceParameterWithSelfBound.java") public void testGenericInterfaceParameterWithSelfBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java"); doTestCompiledJava(fileName); } @TestMetadata("GenericInterfaceParametersWithBounds.java") public void testGenericInterfaceParametersWithBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java"); doTestCompiledJava(fileName); } @TestMetadata("GenericMethodParameters.java") public void testGenericMethodParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("InterfaceWithObjectMethod.java") public void testInterfaceWithObjectMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("Nested.java") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Nested.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Nested.java"); doTestCompiledJava(fileName); } @TestMetadata("Runnable.java") public void testRunnable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Runnable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Runnable.java"); doTestCompiledJava(fileName); } @TestMetadata("SamSubinterfaceOfTwo.java") public void testSamSubinterfaceOfTwo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java"); doTestCompiledJava(fileName); } @TestMetadata("SamSubinterfaceOverridding.java") public void testSamSubinterfaceOverridding() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedSamInterface.java") public void testSubstitutedSamInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java"); doTestCompiledJava(fileName); } @TestMetadata("SubstitutedSamInterfaceSubclassOfBuiltin.java") public void testSubstitutedSamInterfaceSubclassOfBuiltin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java"); doTestCompiledJava(fileName); } @TestMetadata("VarargParameter.java") public void testVarargParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/VarargParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/VarargParameter.java"); doTestCompiledJava(fileName); } @@ -1577,90 +1577,90 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Adapters extends AbstractLoadJavaTest { public void testAllFilesPresentInAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam/adapters"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam/adapters"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AmbiguousAdapters.java") public void testAmbiguousAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java"); doTestCompiledJava(fileName); } @TestMetadata("Basic.java") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java"); doTestCompiledJava(fileName); } @TestMetadata("Constructor.java") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java"); doTestCompiledJava(fileName); } @TestMetadata("ConstructorWithAnnotations.java") public void testConstructorWithAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.java"); doTestCompiledJava(fileName); } @TestMetadata("DeepSamLoop.java") public void testDeepSamLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java"); doTestCompiledJava(fileName); } @TestMetadata("NoSamForClassTypeParameter.java") public void testNoSamForClassTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NoSamForClassTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NoSamForClassTypeParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("NoSamForMethodTypeParameter.java") public void testNoSamForMethodTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NoSamForMethodTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NoSamForMethodTypeParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("NonTrivialFunctionType.java") public void testNonTrivialFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java"); doTestCompiledJava(fileName); } @TestMetadata("PrivateSamAdapter.java") public void testPrivateSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.java"); doTestCompiledJava(fileName); } @TestMetadata("SelfAsParameter.java") public void testSelfAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java"); doTestCompiledJava(fileName); } @TestMetadata("SeveralSamParameters.java") public void testSeveralSamParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParameterOfClass.java") public void testTypeParameterOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParameterOfMethod.java") public void testTypeParameterOfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java"); doTestCompiledJava(fileName); } @TestMetadata("TypeParameterOfOuterClass.java") public void testTypeParameterOfOuterClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java"); doTestCompiledJava(fileName); } @@ -1670,65 +1670,65 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class Inheritance extends AbstractLoadJavaTest { @TestMetadata("AdapterDoesntOverrideDeclaration.java") public void testAdapterDoesntOverrideDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java"); doTestCompiledJava(fileName); } public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("InheritedAdapterAndDeclaration.java") public void testInheritedAdapterAndDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedAmbiguousAdapters.java") public void testInheritedAmbiguousAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedAndOverriddenAmbiguousAdapters.java") public void testInheritedAndOverriddenAmbiguousAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedOverridden.java") public void testInheritedOverridden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedOverriddenAdapter.java") public void testInheritedOverriddenAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedSameAdapters.java") public void testInheritedSameAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedSameAdaptersWithSubstitution.java") public void testInheritedSameAdaptersWithSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.java"); doTestCompiledJava(fileName); } @TestMetadata("InheritedSimple.java") public void testInheritedSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.java"); doTestCompiledJava(fileName); } @TestMetadata("OverriddenAmbiguousAdapters.java") public void testOverriddenAmbiguousAdapters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java"); doTestCompiledJava(fileName); } } @@ -1740,66 +1740,66 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArraysInSubtypes.java") public void testArraysInSubtypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java"); doTestCompiledJava(fileName); } @TestMetadata("MethodTypeParameterErased.java") public void testMethodTypeParameterErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java"); doTestCompiledJava(fileName); } @TestMetadata("RawSuperType.java") public void testRawSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java"); doTestCompiledJava(fileName); } @TestMetadata("RawSuperTypeWithBound.java") public void testRawSuperTypeWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RawSuperTypeWithRecursiveBound.java") public void testRawSuperTypeWithRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.java"); doTestCompiledJava(fileName); } @TestMetadata("RawSuperTypeWithRecursiveBoundMultipleParameters.java") public void testRawSuperTypeWithRecursiveBoundMultipleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.java"); doTestCompiledJava(fileName); } @TestMetadata("ReturnInnerSubclassOfSupersInner.java") public void testReturnInnerSubclassOfSupersInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java"); doTestCompiledJava(fileName); } @TestMetadata("SubclassWithRawType.java") public void testSubclassWithRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesInconsistentGenericTypes.java") public void testTwoSuperclassesInconsistentGenericTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java"); doTestCompiledJava(fileName); } @TestMetadata("TwoSuperclassesVarargAndNot.java") public void testTwoSuperclassesVarargAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java"); doTestCompiledJava(fileName); } } @@ -1809,66 +1809,66 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Static extends AbstractLoadJavaTest { public void testAllFilesPresentInStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("DeeplyInnerClass.java") public void testDeeplyInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java"); doTestCompiledJava(fileName); } @TestMetadata("DeeplyNestedStatic.java") public void testDeeplyNestedStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java"); doTestCompiledJava(fileName); } @TestMetadata("Enum.java") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Enum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Enum.java"); doTestCompiledJava(fileName); } @TestMetadata("InnerClass.java") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/InnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/InnerClass.java"); doTestCompiledJava(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Simple.java"); doTestCompiledJava(fileName); } @TestMetadata("StaticFinal.java") public void testStaticFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticFinal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticFinal.java"); doTestCompiledJava(fileName); } @TestMetadata("StaticMembersFromParentClass.java") public void testStaticMembersFromParentClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentClass.java"); doTestCompiledJava(fileName); } @TestMetadata("StaticMembersFromParentInterface.java") public void testStaticMembersFromParentInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentInterface.java"); doTestCompiledJava(fileName); } @TestMetadata("StaticMembersInEnum.java") public void testStaticMembersInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java"); doTestCompiledJava(fileName); } @TestMetadata("StaticMembersInEnumFromParents.java") public void testStaticMembersInEnumFromParents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.java"); doTestCompiledJava(fileName); } } @@ -1878,18 +1878,18 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("VarargInt.java") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java"); doTestCompiledJava(fileName); } @TestMetadata("VarargString.java") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargString.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargString.java"); doTestCompiledJava(fileName); } } @@ -1900,12 +1900,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaAndKotlin"), Pattern.compile("^(.+)\\.txt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaAndKotlin"), Pattern.compile("^(.+)\\.txt$"), true); } @TestMetadata("MixedPackage.txt") public void testMixedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt"); doTestCompiledJavaAndKotlin(fileName); } @@ -1916,24 +1916,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJavaIncludeObjectMethods extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJavaIncludeObjectMethods() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassWithObjectMethod.java") public void testClassWithObjectMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java"); doTestCompiledJavaIncludeObjectMethods(fileName); } @TestMetadata("EmptyInterface.java") public void testEmptyInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/EmptyInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/EmptyInterface.java"); doTestCompiledJavaIncludeObjectMethods(fileName); } @TestMetadata("InterfaceWithObjectMethods.java") public void testInterfaceWithObjectMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java"); doTestCompiledJavaIncludeObjectMethods(fileName); } } @@ -1943,7 +1943,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @@ -1951,48 +1951,48 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AnnotatedMethod.kt") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AnnotationInAnnotationArguments.kt") public void testAnnotationInAnnotationArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumArgumentWithCustomToString.kt") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MultiDimensionalArrayMethod.kt") public void testMultiDimensionalArrayMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SimpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TargetedAnnotation.kt") public void testTargetedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); doTestCompiledKotlin(fileName); } @@ -2001,54 +2001,54 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractLoadJavaTest { public void testAllFilesPresentInClassMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectPropertyField.kt") public void testClassObjectPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); doTestCompiledKotlin(fileName); } } @@ -2058,96 +2058,96 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractLoadJavaTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationInClassObject.kt") public void testAnnotationInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectInStaticNestedClass.kt") public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DataClass.kt") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DollarsInAnnotationName.kt") public void testDollarsInAnnotationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MultipleAnnotations.kt") public void testMultipleAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedAnnotation.kt") public void testNestedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Retention.kt") public void testRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WithArgument.kt") public void testWithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WithMultipleArguments.kt") public void testWithMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); doTestCompiledKotlin(fileName); } } @@ -2157,54 +2157,54 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractLoadJavaTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumArrayArgument.kt") public void testEnumArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("StringArrayArgument.kt") public void testStringArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); doTestCompiledKotlin(fileName); } } @@ -2214,78 +2214,78 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractLoadJavaTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumConstructor.kt") public void testEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtensionFunctionInClass.kt") public void testExtensionFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtensionPropertySetter.kt") public void testExtensionPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunctionInClass.kt") public void testFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunctionInTrait.kt") public void testFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerClassConstructor.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ManyAnnotations.kt") public void testManyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertySetterInClass.kt") public void testPropertySetterInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TopLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TopLevelPropertySetter.kt") public void testTopLevelPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); doTestCompiledKotlin(fileName); } } @@ -2295,54 +2295,54 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractLoadJavaTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtensionsWithSameNameClass.kt") public void testExtensionsWithSameNameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtensionsWithSameNamePackage.kt") public void testExtensionsWithSameNamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedTrait.kt") public void testNestedTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TopLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TraitClassObject.kt") public void testTraitClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); doTestCompiledKotlin(fileName); } } @@ -2352,42 +2352,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Types extends AbstractLoadJavaTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ReceiverParameter.kt") public void testReceiverParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SimpleTypeAnnotation.kt") public void testSimpleTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SupertypesAndBounds.kt") public void testSupertypesAndBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeAnnotationWithArguments.kt") public void testTypeAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeParameterAnnotationWithArguments.kt") public void testTypeParameterAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); doTestCompiledKotlin(fileName); } } @@ -2397,18 +2397,18 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class WithUseSiteTarget extends AbstractLoadJavaTest { public void testAllFilesPresentInWithUseSiteTarget() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FieldTarget.kt") public void testFieldTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReceiverTarget.kt") public void testReceiverTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); doTestCompiledKotlin(fileName); } } @@ -2419,210 +2419,210 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractLoadJavaTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassInParam.kt") public void testClassInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassInnerClass.kt") public void testClassInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassMemberConflict.kt") public void testClassMemberConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassOutParam.kt") public void testClassOutParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParam.kt") public void testClassParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamReferencesParam.kt") public void testClassParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamReferencesParam2.kt") public void testClassParamReferencesParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamReferencesSelf.kt") public void testClassParamReferencesSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamUpperClassBound.kt") public void testClassParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamUpperClassInterfaceBound.kt") public void testClassParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamUpperInterfaceBound.kt") public void testClassParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassTwoParams2.kt") public void testClassTwoParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumWithGenericConstructorParameter.kt") public void testEnumWithGenericConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("EnumWithPrimitiveConstructorParameter.kt") public void testEnumWithPrimitiveConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritClassSimple.kt") public void testInheritClassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritClassWithParam.kt") public void testInheritClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritSubstitutedMethod.kt") public void testInheritSubstitutedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritTraitWithFunctionParam.kt") public void testInheritTraitWithFunctionParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritTraitWithParam.kt") public void testInheritTraitWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerClassExtendInnerClass.kt") public void testInnerClassExtendInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerGenericClass.kt") public void testInnerGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedObjectInClass.kt") public void testNamedObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedObjectInClassObject.kt") public void testNamedObjectInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedObjectInNamedObject.kt") public void testNamedObjectInNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt") public void testNamedObjectWithAnotherTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedClassExtendNestedClass.kt") public void testNestedClassExtendNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedGenericClass.kt") public void testNestedGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("RecursiveGeneric.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SingleAbstractMethod.kt") public void testSingleAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); doTestCompiledKotlin(fileName); } @@ -2631,42 +2631,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("JavaBeanAbstractGetter.kt") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("JavaBeanVal.kt") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("JavaBeanVar.kt") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("JavaBeanVarOfGenericType.kt") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSetters.kt") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); doTestCompiledKotlin(fileName); } } @@ -2677,42 +2677,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractLoadJavaTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") public void testClassInParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassParamUsedInFun.kt") public void testClassParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunDelegationToTraitImpl.kt") public void testFunDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunInParamSuper.kt") public void testFunInParamSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TraitFinalFun.kt") public void testTraitFinalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TraitOpenFun.kt") public void testTraitOpenFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); doTestCompiledKotlin(fileName); } } @@ -2722,84 +2722,84 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractLoadJavaTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") public void testClassObjectDeclaresVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectDeclaresVar.kt") public void testClassObjectDeclaresVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectDefaultVisibility.kt") public void testClassObjectDefaultVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectExplicitVisibility.kt") public void testClassObjectExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectExtendsTrait.kt") public void testClassObjectExtendsTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectExtendsTraitWithTP.kt") public void testClassObjectExtendsTraitWithTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("classObjectInClassStaticFields.kt") public void testClassObjectInClassStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("classObjectInTraitStaticFields.kt") public void testClassObjectInTraitStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObjectPropertyInClass.kt") public void testClassObjectPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerClassInClassObject.kt") public void testInnerClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SimpleClassObject.kt") public void testSimpleClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); doTestCompiledKotlin(fileName); } } @@ -2809,102 +2809,102 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") public void testConstructor0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Constructor1.kt") public void testConstructor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Constructor1WithParamDefaultValue.kt") public void testConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Constructor2WithOneParamDefaultValue.kt") public void testConstructor2WithOneParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorCollectionParameter.kt") public void testConstructorCollectionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorGenericDeep.kt") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorGenericSimple.kt") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorGenericUpperBound.kt") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTwoDefArgs.kt") public void testConstructorWithTwoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTwoTypeParameters.kt") public void testConstructorWithTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTypeParameter.kt") public void testConstructorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt") public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerClassConstructorWithDefArgs.kt") public void testInnerClassConstructorWithDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt") public void testPrivateConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); doTestCompiledKotlin(fileName); } @@ -2913,18 +2913,18 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") public void testConstructorNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorVararg.kt") public void testConstructorVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); doTestCompiledKotlin(fileName); } } @@ -2935,30 +2935,30 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class DataClass extends AbstractLoadJavaTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") public void testMixedComponents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("OneVal.kt") public void testOneVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoVals.kt") public void testTwoVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoVars.kt") public void testTwoVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); doTestCompiledKotlin(fileName); } } @@ -2968,42 +2968,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractLoadJavaTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumVisibility.kt") public void testEnumVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("enumWithConstuctor.kt") public void testEnumWithConstuctor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("enumWithInnerClasses.kt") public void testEnumWithInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("innerEnumExistingClassObject.kt") public void testInnerEnumExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); doTestCompiledKotlin(fileName); } } @@ -3013,210 +3013,210 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLoadJavaTest { public void testAllFilesPresentInFromLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.kt") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("classObjectAnnotation.kt") public void testClassObjectAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithConstVal.kt") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypeP.kt") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.kt") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypePP.kt") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypePRefNext.kt") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypePRefSelf.kt") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.kt") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FieldAsVar.kt") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FieldOfArrayType.kt") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FinalFieldAsVal.kt") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.kt") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodTypePOneUpperBound.kt") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.kt") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithTypeP.kt") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithTypePP.kt") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithTypePRefClassP.kt") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethosWithPRefTP.kt") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MyException.kt") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("objectMembers.kt") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("packageLevelObject.kt") public void testPackageLevelObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("RemoveRedundantProjectionKind.kt") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoFields.kt") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("UnboundWildcard.kt") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); doTestCompiledKotlin(fileName); } @@ -3226,101 +3226,101 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); doTestCompiledKotlin(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithParentTypeParams.kt") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithSeveralParams.kt") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ConstructorWithoutParams.kt") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("CustomProjectionKind.kt") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithFunctionTypes.kt") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithGenerics.kt") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithMappedClasses.kt") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithTypeParameters.kt") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MethodWithVararg.kt") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyArrayTypes.kt") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyComplexTypes.kt") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertySimpleType.kt") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); doTestCompiledKotlin(fileName); } @@ -3330,167 +3330,167 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class Error extends AbstractLoadJavaTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); doTestCompiledKotlin(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtraUpperBound.kt") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MissingUpperBound.kt") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NoFieldTypeRef.kt") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotVarargReplacedWithVararg.kt") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("RedundantProjectionKind.kt") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReturnTypeMissing.kt") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.kt") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("VarargReplacedWithNotVararg.kt") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongFieldInitializer.kt") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongFieldMutability.kt") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongFieldName.kt") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongMethodName.kt") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongProjectionKind.kt") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeName1.kt") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeName2.kt") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeName3.kt") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.kt") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.kt") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongValueParameterStructure2.kt") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("WrongValueParametersCount.kt") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); doTestCompiledKotlin(fileName); } } @@ -3500,12 +3500,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") public void testPropagateTypeArgumentNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); doTestCompiledKotlin(fileName); } @@ -3514,162 +3514,162 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLoadJavaTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") public void testChangeProjectionKind1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ChangeProjectionKind2.kt") public void testChangeProjectionKind2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNotVararg.kt") public void testInheritNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNotVarargInteger.kt") public void testInheritNotVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNotVarargNotNull.kt") public void testInheritNotVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNotVarargPrimitive.kt") public void testInheritNotVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritVararg.kt") public void testInheritVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritVarargInteger.kt") public void testInheritVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritVarargNotNull.kt") public void testInheritVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritVarargPrimitive.kt") public void testInheritVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Kt3302.kt") public void testKt3302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("MutableToReadOnly.kt") public void testMutableToReadOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotNullToNullable.kt") public void testNotNullToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NullableToNotNull.kt") public void testNullableToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NullableToNotNullKotlinSignature.kt") public void testNullableToNotNullKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("OverrideWithErasedParameter.kt") public void testOverrideWithErasedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReadOnlyToMutable.kt") public void testReadOnlyToMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); doTestCompiledKotlin(fileName); } } @@ -3680,209 +3680,209 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public static class Return extends AbstractLoadJavaTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AddNotNullSameJavaType.kt") public void testAddNotNullSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AddNullabilityJavaSubtype.kt") public void testAddNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AddNullabilitySameGenericType1.kt") public void testAddNullabilitySameGenericType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AddNullabilitySameGenericType2.kt") public void testAddNullabilitySameGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AddNullabilitySameJavaType.kt") public void testAddNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); doTestCompiledKotlin(fileName); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") public void testCantMakeImmutableInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("HalfSubstitutedTypeParameters.kt") public void testHalfSubstitutedTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullabilityGenericSubclassSimple.kt") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullabilityJavaSubtype.kt") public void testInheritNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullabilitySameGenericType.kt") public void testInheritNullabilitySameGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullabilitySameJavaType.kt") public void testInheritNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritReadOnlinessOfArgument.kt") public void testInheritReadOnlinessOfArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritReadOnlinessSameClass.kt") public void testInheritReadOnlinessSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritReadOnlinessSubclass.kt") public void testInheritReadOnlinessSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SameProjectionKind.kt") public void testSameProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubclassOfCollection.kt") public void testSubclassOfCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubclassOfMapEntry.kt") public void testSubclassOfMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesMutableAndNot.kt") public void testTwoSuperclassesMutableAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesReturnSameJavaType.kt") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclassesSupplementNotNull.kt") public void testTwoSuperclassesSupplementNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeParamOfClass.kt") public void testTypeParamOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeParamOfClassSubstituted.kt") public void testTypeParamOfClassSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TypeParamOfFun.kt") public void testTypeParamOfFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); doTestCompiledKotlin(fileName); } } @@ -3892,60 +3892,60 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLoadJavaTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoBounds.kt") public void testTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoSuperclasses.kt") public void testTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TwoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("UseParameterAsUpperBound.kt") public void testUseParameterAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("UseParameterInUpperBound.kt") public void testUseParameterInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); doTestCompiledKotlin(fileName); } } @@ -3957,24 +3957,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractLoadJavaTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("LoadIterator.kt") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Max.kt") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); doTestCompiledKotlin(fileName); } } @@ -3984,12 +3984,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); doTestCompiledKotlin(fileName); } } @@ -3999,36 +3999,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotNullIntArray.kt") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotNullMethod.kt") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotNullObjectArray.kt") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NotNullParameter.kt") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); doTestCompiledKotlin(fileName); } } @@ -4039,72 +4039,72 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractLoadJavaTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Assert.kt") public void testAssert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InfixKeyword.kt") public void testInfixKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt") public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritValAndVar.kt") public void testInheritValAndVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InheritValsDifferentTypes.kt") public void testInheritValsDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NoSamAdapter.kt") public void testNoSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NoSamConstructor.kt") public void testNoSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("OperatorKeyword.kt") public void testOperatorKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropagateDeepSubclass.kt") public void testPropagateDeepSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropagateSubclassOfComparable.kt") public void testPropagateSubclassOfComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); doTestCompiledKotlin(fileName); } @@ -4113,66 +4113,66 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractLoadJavaTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") public void testFunGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamParam.kt") public void testFunParamParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamParamErased.kt") public void testFunParamParamErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamReferencesParam.kt") public void testFunParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamTwoUpperBounds.kt") public void testFunParamTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamUpperClassBound.kt") public void testFunParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamUpperClassInterfaceBound.kt") public void testFunParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamUpperInterfaceBound.kt") public void testFunParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunTwoTypeParams.kt") public void testFunTwoTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); doTestCompiledKotlin(fileName); } } @@ -4182,36 +4182,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractLoadJavaTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") public void testFunClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunClassParamNullable.kt") public void testFunClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamNullable.kt") public void testFunParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReturnTypeClassParamNotNull.kt") public void testReturnTypeClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReturnTypeClassParamNullable.kt") public void testReturnTypeClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); doTestCompiledKotlin(fileName); } } @@ -4221,102 +4221,102 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractLoadJavaTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") public void testClassFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassFunGetFoo.kt") public void testClassFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassFunGetFooSetFoo.kt") public void testClassFunGetFooSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassFunSetFoo.kt") public void testClassFunSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtFunInClass.kt") public void testExtFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunDefaultArg.kt") public void testFunDefaultArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunParamNotNull.kt") public void testFunParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunVarargInt.kt") public void testFunVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("FunVarargInteger.kt") public void testFunVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ModifierAbstract.kt") public void testModifierAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ModifierOpen.kt") public void testModifierOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NsFun.kt") public void testNsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NsFunGetFoo.kt") public void testNsFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReturnTypeNotNull.kt") public void testReturnTypeNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ReturnTypeNullable.kt") public void testReturnTypeNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); doTestCompiledKotlin(fileName); } } @@ -4326,24 +4326,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") public void testNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("VarargInt.kt") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("VarargString.kt") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); doTestCompiledKotlin(fileName); } } @@ -4354,12 +4354,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractLoadJavaTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); doTestCompiledKotlin(fileName); } } @@ -4369,42 +4369,42 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class MemberOrder extends AbstractLoadJavaTest { public void testAllFilesPresentInMemberOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callablesNameClash.kt") public void testCallablesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("extensionMembers.kt") public void testExtensionMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("extensionPropertiesNameClash.kt") public void testExtensionPropertiesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("topLevelCallables.kt") public void testTopLevelCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); doTestCompiledKotlin(fileName); } } @@ -4414,24 +4414,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Nested extends AbstractLoadJavaTest { public void testAllFilesPresentInNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); doTestCompiledKotlin(fileName); } } @@ -4441,18 +4441,18 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractLoadJavaTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("notnullTypeArgument.kt") public void testNotnullTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("nullableTypeArgument.kt") public void testNullableTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); doTestCompiledKotlin(fileName); } } @@ -4462,204 +4462,204 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractLoadJavaTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassValAbstract.kt") public void testClassValAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("CollectionSize.kt") public void testCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValClass.kt") public void testExtValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValInClass.kt") public void testExtValInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValInt.kt") public void testExtValInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValIntCharSequence.kt") public void testExtValIntCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValIntCharSequenceQ.kt") public void testExtValIntCharSequenceQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValIntListQOfIntInClass.kt") public void testExtValIntListQOfIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValIntTInClass.kt") public void testExtValIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValIntTQInClass.kt") public void testExtValIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValTIntInClass.kt") public void testExtValTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarClass.kt") public void testExtVarClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarInClass.kt") public void testExtVarInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarInt.kt") public void testExtVarInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarIntTInClass.kt") public void testExtVarIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarIntTQInClass.kt") public void testExtVarIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarMapPQInt.kt") public void testExtVarMapPQInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarTIntInClass.kt") public void testExtVarTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarTQIntInClass.kt") public void testExtVarTQIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarl.kt") public void testExtVarl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NsVal.kt") public void testNsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NsVar.kt") public void testNsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("OverrideClassVal.kt") public void testOverrideClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("OverrideTraitVal.kt") public void testOverrideTraitVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropFromSuperclass.kt") public void testPropFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TraitFinalVar.kt") public void testTraitFinalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TraitOpenVal.kt") public void testTraitOpenVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("VarDelegationToTraitImpl.kt") public void testVarDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("VarWithDelegated.kt") public void testVarWithDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); doTestCompiledKotlin(fileName); } @@ -4668,66 +4668,66 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractLoadJavaTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassValParams.kt") public void testClassValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassValWithGet.kt") public void testClassValWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVarModality.kt") public void testClassVarModality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVarParams.kt") public void testClassVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVarWithGet.kt") public void testClassVarWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ClassVarWithSet.kt") public void testClassVarWithSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtValLong.kt") public void testExtValLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ExtVarLong.kt") public void testExtVarLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); doTestCompiledKotlin(fileName); } } @@ -4738,186 +4738,186 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractLoadJavaTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") public void testAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("AnyQ.kt") public void testAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfInNumber.kt") public void testArrayOfInNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfInt.kt") public void testArrayOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfInteger.kt") public void testArrayOfInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfOutNumber.kt") public void testArrayOfOutNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfOutT.kt") public void testArrayOfOutT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ArrayOfString.kt") public void testArrayOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Function1IntString.kt") public void testFunction1IntString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("IntQ.kt") public void testIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlInteger.kt") public void testJlInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlIntegerQ.kt") public void testJlIntegerQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlNumber.kt") public void testJlNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlObject.kt") public void testJlObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlObjectQ.kt") public void testJlObjectQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlString.kt") public void testJlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("jlStringQ.kt") public void testJlStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ListOfAny.kt") public void testListOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ListOfAnyQ.kt") public void testListOfAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ListOfStar.kt") public void testListOfStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ListOfString.kt") public void testListOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("ListOfjlString.kt") public void testListOfjlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("NothingQ.kt") public void testNothingQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("platform.kt") public void testPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("String.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("StringQ.kt") public void testStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("Unit.kt") public void testUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); doTestCompiledKotlin(fileName); } } @@ -4927,72 +4927,72 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadJavaTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InternalClass.kt") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InternalConstructor.kt") public void testInternalConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("InternalTopLevelMembers.kt") public void testInternalTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateClass.kt") public void testPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateClassMembers.kt") public void testPrivateClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateToThis.kt") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateTopLevelFun.kt") public void testPrivateTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PrivateTopLevelVal.kt") public void testPrivateTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("PropertyInConstructorExplicitVisibility.kt") public void testPropertyInConstructorExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); doTestCompiledKotlin(fileName); } @TestMetadata("TopLevelVarWithPrivateSetter.kt") public void testTopLevelVarWithPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); doTestCompiledKotlin(fileName); } } @@ -5003,7 +5003,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlinWithStdlib extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlinWithStdlib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability") @@ -5011,30 +5011,30 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Mutability extends AbstractLoadJavaTest { public void testAllFilesPresentInMutability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.kt"); doTestCompiledKotlinWithStdlib(fileName); } @TestMetadata("LoadIterableWithConflict.kt") public void testLoadIterableWithConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.kt"); doTestCompiledKotlinWithStdlib(fileName); } @TestMetadata("LoadIterableWithNullability.kt") public void testLoadIterableWithNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.kt"); doTestCompiledKotlinWithStdlib(fileName); } @TestMetadata("LoadIterableWithPropagation.kt") public void testLoadIterableWithPropagation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.kt"); doTestCompiledKotlinWithStdlib(fileName); } } @@ -5044,12 +5044,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class PlatformNames extends AbstractLoadJavaTest { public void testAllFilesPresentInPlatformNames() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionName.kt") public void testFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt"); doTestCompiledKotlinWithStdlib(fileName); } } @@ -5060,7 +5060,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaAgainstKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin"), Pattern.compile("^(.+)\\.txt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin"), Pattern.compile("^(.+)\\.txt$"), true); } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters") @@ -5068,36 +5068,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class SamAdapters extends AbstractLoadJavaTest { public void testAllFilesPresentInSamAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/samAdapters"), Pattern.compile("^(.+)\\.txt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/samAdapters"), Pattern.compile("^(.+)\\.txt$"), true); } @TestMetadata("InheritAmbguousSamAdaptersInKotlin.txt") public void testInheritAmbguousSamAdaptersInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("InheritSamAdapterInKotlin.txt") public void testInheritSamAdapterInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("OverrideSamAdapterInKotlin.txt") public void testOverrideSamAdapterInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("SamAdapterForInheritedFromKotlin.txt") public void testSamAdapterForInheritedFromKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("SamAdapterForOverriddenFromKotlin.txt") public void testSamAdapterForOverriddenFromKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt"); doTestJavaAgainstKotlin(fileName); } @@ -5108,36 +5108,36 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation"), Pattern.compile("^(.+)\\.txt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation"), Pattern.compile("^(.+)\\.txt$"), true); } @TestMetadata("DeepSubclassingKotlinInJava.txt") public void testDeepSubclassingKotlinInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("InheritExtensionAndNot.txt") public void testInheritExtensionAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("InheritExtensionFunction.txt") public void testInheritExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("SubclassFromTraitImplementation.txt") public void testSubclassFromTraitImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("SubclassingKotlinInJava.txt") public void testSubclassingKotlinInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt"); doTestJavaAgainstKotlin(fileName); } @@ -5148,18 +5148,18 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadJavaTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/visibility"), Pattern.compile("^(.+)\\.txt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/visibility"), Pattern.compile("^(.+)\\.txt$"), true); } @TestMetadata("PackageLocal.txt") public void testPackageLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt"); doTestJavaAgainstKotlin(fileName); } @TestMetadata("ProtectedPackage.txt") public void testProtectedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt"); doTestJavaAgainstKotlin(fileName); } @@ -5171,30 +5171,30 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class KotlinAgainstCompiledJavaWithKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinAgainstCompiledJavaWithKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("InheritJavaField.kt") public void testInheritJavaField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt"); doTestKotlinAgainstCompiledJavaWithKotlin(fileName); } @TestMetadata("InheritParameterName.kt") public void testInheritParameterName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt"); doTestKotlinAgainstCompiledJavaWithKotlin(fileName); } @TestMetadata("javaRefersToKotlin.kt") public void testJavaRefersToKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.kt"); doTestKotlinAgainstCompiledJavaWithKotlin(fileName); } @TestMetadata("propagationAgainstDeserializedSuperclass.kt") public void testPropagationAgainstDeserializedSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt"); doTestKotlinAgainstCompiledJavaWithKotlin(fileName); } } @@ -5204,48 +5204,48 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @RunWith(JUnit3RunnerWithInners.class) public static class SourceJava extends AbstractLoadJavaTest { public void testAllFilesPresentInSourceJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassExtendsTypeParameter.java") public void testClassExtendsTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java"); doTestSourceJava(fileName); } @TestMetadata("ErrorTypes.java") public void testErrorTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ErrorTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ErrorTypes.java"); doTestSourceJava(fileName); } @TestMetadata("NullInAnnotation.java") public void testNullInAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/NullInAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/NullInAnnotation.java"); doTestSourceJava(fileName); } @TestMetadata("ReturnInnerSubclassOfSupersInner.java") public void testReturnInnerSubclassOfSupersInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java"); doTestSourceJava(fileName); } @TestMetadata("ReturnNotSubtype.java") public void testReturnNotSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java"); doTestSourceJava(fileName); } @TestMetadata("TypeAnnotations.java") public void testTypeAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/TypeAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/TypeAnnotations.java"); doTestSourceJava(fileName); } @TestMetadata("WrongNumberOfGenericParameters.java") public void testWrongNumberOfGenericParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java"); doTestSourceJava(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java index 16c83ecda48..65173e44ef8 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadKotlinWithTypeTableTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @@ -40,48 +40,48 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); doTest(fileName); } @TestMetadata("AnnotatedMethod.kt") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); doTest(fileName); } @TestMetadata("AnnotationInAnnotationArguments.kt") public void testAnnotationInAnnotationArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); doTest(fileName); } @TestMetadata("EnumArgumentWithCustomToString.kt") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); doTest(fileName); } @TestMetadata("MultiDimensionalArrayMethod.kt") public void testMultiDimensionalArrayMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); doTest(fileName); } @TestMetadata("SimpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); doTest(fileName); } @TestMetadata("TargetedAnnotation.kt") public void testTargetedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); doTest(fileName); } @@ -90,54 +90,54 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInClassMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectPropertyField.kt") public void testClassObjectPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); doTest(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); doTest(fileName); } } @@ -147,96 +147,96 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationInClassObject.kt") public void testAnnotationInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObjectInStaticNestedClass.kt") public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); doTest(fileName); } @TestMetadata("DataClass.kt") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); doTest(fileName); } @TestMetadata("DollarsInAnnotationName.kt") public void testDollarsInAnnotationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); doTest(fileName); } @TestMetadata("MultipleAnnotations.kt") public void testMultipleAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); doTest(fileName); } @TestMetadata("NestedAnnotation.kt") public void testNestedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); doTest(fileName); } @TestMetadata("Retention.kt") public void testRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); doTest(fileName); } @TestMetadata("WithArgument.kt") public void testWithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); doTest(fileName); } @TestMetadata("WithMultipleArguments.kt") public void testWithMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); doTest(fileName); } } @@ -246,54 +246,54 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("EnumArrayArgument.kt") public void testEnumArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); doTest(fileName); } @TestMetadata("StringArrayArgument.kt") public void testStringArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); doTest(fileName); } } @@ -303,78 +303,78 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); doTest(fileName); } @TestMetadata("EnumConstructor.kt") public void testEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); doTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctionInClass.kt") public void testExtensionFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); doTest(fileName); } @TestMetadata("ExtensionPropertySetter.kt") public void testExtensionPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); doTest(fileName); } @TestMetadata("FunctionInClass.kt") public void testFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); doTest(fileName); } @TestMetadata("FunctionInTrait.kt") public void testFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructor.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); doTest(fileName); } @TestMetadata("ManyAnnotations.kt") public void testManyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); doTest(fileName); } @TestMetadata("PropertySetterInClass.kt") public void testPropertySetterInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); doTest(fileName); } @TestMetadata("TopLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); doTest(fileName); } @TestMetadata("TopLevelPropertySetter.kt") public void testTopLevelPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); doTest(fileName); } } @@ -384,54 +384,54 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNameClass.kt") public void testExtensionsWithSameNameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNamePackage.kt") public void testExtensionsWithSameNamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); doTest(fileName); } @TestMetadata("NestedTrait.kt") public void testNestedTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); doTest(fileName); } @TestMetadata("TopLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); doTest(fileName); } @TestMetadata("TraitClassObject.kt") public void testTraitClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); doTest(fileName); } } @@ -441,42 +441,42 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Types extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ReceiverParameter.kt") public void testReceiverParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); doTest(fileName); } @TestMetadata("SimpleTypeAnnotation.kt") public void testSimpleTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("SupertypesAndBounds.kt") public void testSupertypesAndBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); doTest(fileName); } @TestMetadata("TypeAnnotationWithArguments.kt") public void testTypeAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotationWithArguments.kt") public void testTypeParameterAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); doTest(fileName); } } @@ -486,18 +486,18 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class WithUseSiteTarget extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInWithUseSiteTarget() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FieldTarget.kt") public void testFieldTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); doTest(fileName); } @TestMetadata("ReceiverTarget.kt") public void testReceiverTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); doTest(fileName); } } @@ -508,210 +508,210 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); doTest(fileName); } @TestMetadata("ClassInParam.kt") public void testClassInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); doTest(fileName); } @TestMetadata("ClassInnerClass.kt") public void testClassInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); doTest(fileName); } @TestMetadata("ClassMemberConflict.kt") public void testClassMemberConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); doTest(fileName); } @TestMetadata("ClassOutParam.kt") public void testClassOutParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); doTest(fileName); } @TestMetadata("ClassParam.kt") public void testClassParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam.kt") public void testClassParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam2.kt") public void testClassParamReferencesParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesSelf.kt") public void testClassParamReferencesSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassBound.kt") public void testClassParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassInterfaceBound.kt") public void testClassParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperInterfaceBound.kt") public void testClassParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams2.kt") public void testClassTwoParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); doTest(fileName); } @TestMetadata("EnumWithGenericConstructorParameter.kt") public void testEnumWithGenericConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); doTest(fileName); } @TestMetadata("EnumWithPrimitiveConstructorParameter.kt") public void testEnumWithPrimitiveConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); doTest(fileName); } @TestMetadata("InheritClassSimple.kt") public void testInheritClassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); doTest(fileName); } @TestMetadata("InheritClassWithParam.kt") public void testInheritClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); doTest(fileName); } @TestMetadata("InheritSubstitutedMethod.kt") public void testInheritSubstitutedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithFunctionParam.kt") public void testInheritTraitWithFunctionParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithParam.kt") public void testInheritTraitWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); doTest(fileName); } @TestMetadata("InnerClassExtendInnerClass.kt") public void testInnerClassExtendInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); doTest(fileName); } @TestMetadata("InnerGenericClass.kt") public void testInnerGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClass.kt") public void testNamedObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClassObject.kt") public void testNamedObjectInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInNamedObject.kt") public void testNamedObjectInNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt") public void testNamedObjectWithAnotherTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); doTest(fileName); } @TestMetadata("NestedClassExtendNestedClass.kt") public void testNestedClassExtendNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); doTest(fileName); } @TestMetadata("NestedGenericClass.kt") public void testNestedGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); doTest(fileName); } @TestMetadata("RecursiveGeneric.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); doTest(fileName); } @TestMetadata("SingleAbstractMethod.kt") public void testSingleAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); doTest(fileName); } @@ -720,42 +720,42 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanAbstractGetter.kt") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanVal.kt") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); doTest(fileName); } @TestMetadata("JavaBeanVar.kt") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); doTest(fileName); } @TestMetadata("JavaBeanVarOfGenericType.kt") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); doTest(fileName); } @TestMetadata("TwoSetters.kt") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); doTest(fileName); } } @@ -766,42 +766,42 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") public void testClassInParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("ClassParamUsedInFun.kt") public void testClassParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("FunDelegationToTraitImpl.kt") public void testFunDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("FunInParamSuper.kt") public void testFunInParamSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); doTest(fileName); } @TestMetadata("TraitFinalFun.kt") public void testTraitFinalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); doTest(fileName); } @TestMetadata("TraitOpenFun.kt") public void testTraitOpenFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); doTest(fileName); } } @@ -811,84 +811,84 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") public void testClassObjectDeclaresVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); doTest(fileName); } @TestMetadata("ClassObjectDeclaresVar.kt") public void testClassObjectDeclaresVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); doTest(fileName); } @TestMetadata("ClassObjectDefaultVisibility.kt") public void testClassObjectDefaultVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExplicitVisibility.kt") public void testClassObjectExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTrait.kt") public void testClassObjectExtendsTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTraitWithTP.kt") public void testClassObjectExtendsTraitWithTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); doTest(fileName); } @TestMetadata("classObjectInClassStaticFields.kt") public void testClassObjectInClassStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); doTest(fileName); } @TestMetadata("classObjectInTraitStaticFields.kt") public void testClassObjectInTraitStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); doTest(fileName); } @TestMetadata("ClassObjectPropertyInClass.kt") public void testClassObjectPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); doTest(fileName); } @TestMetadata("InnerClassInClassObject.kt") public void testInnerClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); doTest(fileName); } @TestMetadata("SimpleClassObject.kt") public void testSimpleClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); doTest(fileName); } } @@ -898,102 +898,102 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") public void testConstructor0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); doTest(fileName); } @TestMetadata("Constructor1.kt") public void testConstructor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); doTest(fileName); } @TestMetadata("Constructor1WithParamDefaultValue.kt") public void testConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("Constructor2WithOneParamDefaultValue.kt") public void testConstructor2WithOneParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("ConstructorCollectionParameter.kt") public void testConstructorCollectionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericDeep.kt") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericSimple.kt") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericUpperBound.kt") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoDefArgs.kt") public void testConstructorWithTwoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParameters.kt") public void testConstructorWithTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParameter.kt") public void testConstructorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt") public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructorWithDefArgs.kt") public void testInnerClassConstructorWithDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); doTest(fileName); } @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt") public void testPrivateConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); doTest(fileName); } @@ -1002,18 +1002,18 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") public void testConstructorNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); doTest(fileName); } @TestMetadata("ConstructorVararg.kt") public void testConstructorVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); doTest(fileName); } } @@ -1024,30 +1024,30 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class DataClass extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") public void testMixedComponents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); doTest(fileName); } @TestMetadata("OneVal.kt") public void testOneVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); doTest(fileName); } @TestMetadata("TwoVals.kt") public void testTwoVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); doTest(fileName); } @TestMetadata("TwoVars.kt") public void testTwoVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); doTest(fileName); } } @@ -1057,42 +1057,42 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumVisibility.kt") public void testEnumVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); doTest(fileName); } @TestMetadata("enumWithConstuctor.kt") public void testEnumWithConstuctor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); doTest(fileName); } @TestMetadata("enumWithInnerClasses.kt") public void testEnumWithInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerEnumExistingClassObject.kt") public void testInnerEnumExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); doTest(fileName); } } @@ -1102,210 +1102,210 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInFromLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); doTest(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.kt") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); doTest(fileName); } @TestMetadata("classObjectAnnotation.kt") public void testClassObjectAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); doTest(fileName); } @TestMetadata("ClassWithConstVal.kt") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); doTest(fileName); } @TestMetadata("ClassWithTypeP.kt") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.kt") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePP.kt") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefNext.kt") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelf.kt") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.kt") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); doTest(fileName); } @TestMetadata("FieldAsVar.kt") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); doTest(fileName); } @TestMetadata("FieldOfArrayType.kt") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); doTest(fileName); } @TestMetadata("FinalFieldAsVal.kt") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); doTest(fileName); } @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.kt") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); doTest(fileName); } @TestMetadata("MethodTypePOneUpperBound.kt") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); doTest(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.kt") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeP.kt") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePP.kt") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePRefClassP.kt") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); doTest(fileName); } @TestMetadata("MethosWithPRefTP.kt") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); doTest(fileName); } @TestMetadata("MyException.kt") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); doTest(fileName); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); doTest(fileName); } @TestMetadata("objectMembers.kt") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); doTest(fileName); } @TestMetadata("packageLevelObject.kt") public void testPackageLevelObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); doTest(fileName); } @TestMetadata("RemoveRedundantProjectionKind.kt") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); doTest(fileName); } @TestMetadata("TwoFields.kt") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); doTest(fileName); } @TestMetadata("UnboundWildcard.kt") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); doTest(fileName); } @@ -1315,101 +1315,101 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith public static class KotlinSignature extends AbstractLoadKotlinWithTypeTableTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); doTest(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); doTest(fileName); } @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithParentTypeParams.kt") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithSeveralParams.kt") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithoutParams.kt") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); doTest(fileName); } @TestMetadata("CustomProjectionKind.kt") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); doTest(fileName); } @TestMetadata("MethodWithFunctionTypes.kt") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); doTest(fileName); } @TestMetadata("MethodWithGenerics.kt") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); doTest(fileName); } @TestMetadata("MethodWithMappedClasses.kt") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeParameters.kt") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); doTest(fileName); } @TestMetadata("MethodWithVararg.kt") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); doTest(fileName); } @TestMetadata("PropertyArrayTypes.kt") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); doTest(fileName); } @TestMetadata("PropertyComplexTypes.kt") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); doTest(fileName); } @TestMetadata("PropertySimpleType.kt") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); doTest(fileName); } @@ -1419,167 +1419,167 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith public static class Error extends AbstractLoadKotlinWithTypeTableTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); doTest(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); doTest(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); doTest(fileName); } @TestMetadata("ExtraUpperBound.kt") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); doTest(fileName); } @TestMetadata("MissingUpperBound.kt") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); doTest(fileName); } @TestMetadata("NoFieldTypeRef.kt") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); doTest(fileName); } @TestMetadata("NotVarargReplacedWithVararg.kt") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); doTest(fileName); } @TestMetadata("RedundantProjectionKind.kt") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("ReturnTypeMissing.kt") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); doTest(fileName); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); doTest(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.kt") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); doTest(fileName); } @TestMetadata("VarargReplacedWithNotVararg.kt") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); doTest(fileName); } @TestMetadata("WrongFieldInitializer.kt") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); doTest(fileName); } @TestMetadata("WrongFieldMutability.kt") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); doTest(fileName); } @TestMetadata("WrongFieldName.kt") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); doTest(fileName); } @TestMetadata("WrongMethodName.kt") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); doTest(fileName); } @TestMetadata("WrongProjectionKind.kt") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); doTest(fileName); } @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); doTest(fileName); } @TestMetadata("WrongTypeName1.kt") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); doTest(fileName); } @TestMetadata("WrongTypeName2.kt") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); doTest(fileName); } @TestMetadata("WrongTypeName3.kt") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.kt") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.kt") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); doTest(fileName); } @TestMetadata("WrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure2.kt") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); doTest(fileName); } @TestMetadata("WrongValueParametersCount.kt") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); doTest(fileName); } } @@ -1589,12 +1589,12 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") public void testPropagateTypeArgumentNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); doTest(fileName); } @@ -1603,162 +1603,162 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") public void testChangeProjectionKind1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); doTest(fileName); } @TestMetadata("ChangeProjectionKind2.kt") public void testChangeProjectionKind2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNotVararg.kt") public void testInheritNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargInteger.kt") public void testInheritNotVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargNotNull.kt") public void testInheritNotVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargPrimitive.kt") public void testInheritNotVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("InheritVararg.kt") public void testInheritVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); doTest(fileName); } @TestMetadata("InheritVarargInteger.kt") public void testInheritVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritVarargNotNull.kt") public void testInheritVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritVarargPrimitive.kt") public void testInheritVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("Kt3302.kt") public void testKt3302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); doTest(fileName); } @TestMetadata("MutableToReadOnly.kt") public void testMutableToReadOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); doTest(fileName); } @TestMetadata("NotNullToNullable.kt") public void testNotNullToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); doTest(fileName); } @TestMetadata("NullableToNotNull.kt") public void testNullableToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); doTest(fileName); } @TestMetadata("NullableToNotNullKotlinSignature.kt") public void testNullableToNotNullKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); doTest(fileName); } @TestMetadata("OverrideWithErasedParameter.kt") public void testOverrideWithErasedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); doTest(fileName); } @TestMetadata("ReadOnlyToMutable.kt") public void testReadOnlyToMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); doTest(fileName); } } @@ -1769,209 +1769,209 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith public static class Return extends AbstractLoadKotlinWithTypeTableTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNotNullSameJavaType.kt") public void testAddNotNullSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); doTest(fileName); } @TestMetadata("AddNullabilityJavaSubtype.kt") public void testAddNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType1.kt") public void testAddNullabilitySameGenericType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType2.kt") public void testAddNullabilitySameGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameJavaType.kt") public void testAddNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); doTest(fileName); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") public void testCantMakeImmutableInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("HalfSubstitutedTypeParameters.kt") public void testHalfSubstitutedTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityGenericSubclassSimple.kt") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityJavaSubtype.kt") public void testInheritNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameGenericType.kt") public void testInheritNullabilitySameGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameJavaType.kt") public void testInheritNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessOfArgument.kt") public void testInheritReadOnlinessOfArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSameClass.kt") public void testInheritReadOnlinessSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSubclass.kt") public void testInheritReadOnlinessSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); doTest(fileName); } @TestMetadata("SameProjectionKind.kt") public void testSameProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubclassOfCollection.kt") public void testSubclassOfCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); doTest(fileName); } @TestMetadata("SubclassOfMapEntry.kt") public void testSubclassOfMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesMutableAndNot.kt") public void testTwoSuperclassesMutableAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnSameJavaType.kt") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesSupplementNotNull.kt") public void testTwoSuperclassesSupplementNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClass.kt") public void testTypeParamOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClassSubstituted.kt") public void testTypeParamOfClassSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); doTest(fileName); } @TestMetadata("TypeParamOfFun.kt") public void testTypeParamOfFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); doTest(fileName); } } @@ -1981,60 +1981,60 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("TwoBounds.kt") public void testTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclasses.kt") public void testTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); doTest(fileName); } @TestMetadata("TwoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("UseParameterAsUpperBound.kt") public void testUseParameterAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBound.kt") public void testUseParameterInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); doTest(fileName); } } @@ -2046,24 +2046,24 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); doTest(fileName); } @TestMetadata("LoadIterator.kt") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); doTest(fileName); } @TestMetadata("Max.kt") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); doTest(fileName); } } @@ -2073,12 +2073,12 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); doTest(fileName); } } @@ -2088,36 +2088,36 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); doTest(fileName); } @TestMetadata("NotNullIntArray.kt") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); doTest(fileName); } @TestMetadata("NotNullMethod.kt") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); doTest(fileName); } @TestMetadata("NotNullObjectArray.kt") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); doTest(fileName); } @TestMetadata("NotNullParameter.kt") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); doTest(fileName); } } @@ -2128,72 +2128,72 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Assert.kt") public void testAssert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); doTest(fileName); } @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); doTest(fileName); } @TestMetadata("InfixKeyword.kt") public void testInfixKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt") public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); doTest(fileName); } @TestMetadata("InheritValAndVar.kt") public void testInheritValAndVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); doTest(fileName); } @TestMetadata("InheritValsDifferentTypes.kt") public void testInheritValsDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); doTest(fileName); } @TestMetadata("NoSamAdapter.kt") public void testNoSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); doTest(fileName); } @TestMetadata("NoSamConstructor.kt") public void testNoSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); doTest(fileName); } @TestMetadata("OperatorKeyword.kt") public void testOperatorKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); doTest(fileName); } @TestMetadata("PropagateDeepSubclass.kt") public void testPropagateDeepSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); doTest(fileName); } @TestMetadata("PropagateSubclassOfComparable.kt") public void testPropagateSubclassOfComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); doTest(fileName); } @@ -2202,66 +2202,66 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") public void testFunGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); doTest(fileName); } @TestMetadata("FunParamParam.kt") public void testFunParamParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); doTest(fileName); } @TestMetadata("FunParamParamErased.kt") public void testFunParamParamErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); doTest(fileName); } @TestMetadata("FunParamReferencesParam.kt") public void testFunParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("FunParamTwoUpperBounds.kt") public void testFunParamTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassBound.kt") public void testFunParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassInterfaceBound.kt") public void testFunParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperInterfaceBound.kt") public void testFunParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); doTest(fileName); } @TestMetadata("FunTwoTypeParams.kt") public void testFunTwoTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); doTest(fileName); } } @@ -2271,36 +2271,36 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") public void testFunClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunClassParamNullable.kt") public void testFunClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); doTest(fileName); } @TestMetadata("FunParamNullable.kt") public void testFunParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNotNull.kt") public void testReturnTypeClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNullable.kt") public void testReturnTypeClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); doTest(fileName); } } @@ -2310,102 +2310,102 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") public void testClassFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFoo.kt") public void testClassFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFooSetFoo.kt") public void testClassFunGetFooSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunSetFoo.kt") public void testClassFunSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); doTest(fileName); } @TestMetadata("ExtFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); doTest(fileName); } @TestMetadata("ExtFunInClass.kt") public void testExtFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); doTest(fileName); } @TestMetadata("FunDefaultArg.kt") public void testFunDefaultArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); doTest(fileName); } @TestMetadata("FunParamNotNull.kt") public void testFunParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunVarargInt.kt") public void testFunVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); doTest(fileName); } @TestMetadata("FunVarargInteger.kt") public void testFunVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); doTest(fileName); } @TestMetadata("ModifierAbstract.kt") public void testModifierAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); doTest(fileName); } @TestMetadata("ModifierOpen.kt") public void testModifierOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); doTest(fileName); } @TestMetadata("NsFun.kt") public void testNsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); doTest(fileName); } @TestMetadata("NsFunGetFoo.kt") public void testNsFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNotNull.kt") public void testReturnTypeNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNullable.kt") public void testReturnTypeNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); doTest(fileName); } } @@ -2415,24 +2415,24 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") public void testNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); doTest(fileName); } @TestMetadata("VarargInt.kt") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); doTest(fileName); } @TestMetadata("VarargString.kt") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); doTest(fileName); } } @@ -2443,12 +2443,12 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); doTest(fileName); } } @@ -2458,42 +2458,42 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class MemberOrder extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInMemberOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callablesNameClash.kt") public void testCallablesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); doTest(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); doTest(fileName); } @TestMetadata("extensionMembers.kt") public void testExtensionMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); doTest(fileName); } @TestMetadata("extensionPropertiesNameClash.kt") public void testExtensionPropertiesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); doTest(fileName); } @TestMetadata("topLevelCallables.kt") public void testTopLevelCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); doTest(fileName); } } @@ -2503,24 +2503,24 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Nested extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); doTest(fileName); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); doTest(fileName); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); doTest(fileName); } } @@ -2530,18 +2530,18 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("notnullTypeArgument.kt") public void testNotnullTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); doTest(fileName); } @TestMetadata("nullableTypeArgument.kt") public void testNullableTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); doTest(fileName); } } @@ -2551,204 +2551,204 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValAbstract.kt") public void testClassValAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); doTest(fileName); } @TestMetadata("CollectionSize.kt") public void testCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); doTest(fileName); } @TestMetadata("Const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); doTest(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); doTest(fileName); } @TestMetadata("ExtValClass.kt") public void testExtValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); doTest(fileName); } @TestMetadata("ExtValInClass.kt") public void testExtValInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); doTest(fileName); } @TestMetadata("ExtValInt.kt") public void testExtValInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequence.kt") public void testExtValIntCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequenceQ.kt") public void testExtValIntCharSequenceQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); doTest(fileName); } @TestMetadata("ExtValIntListQOfIntInClass.kt") public void testExtValIntListQOfIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTInClass.kt") public void testExtValIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTQInClass.kt") public void testExtValIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtValTIntInClass.kt") public void testExtValTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarClass.kt") public void testExtVarClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInClass.kt") public void testExtVarInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInt.kt") public void testExtVarInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTInClass.kt") public void testExtVarIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTQInClass.kt") public void testExtVarIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarMapPQInt.kt") public void testExtVarMapPQInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); doTest(fileName); } @TestMetadata("ExtVarTIntInClass.kt") public void testExtVarTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarTQIntInClass.kt") public void testExtVarTQIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarl.kt") public void testExtVarl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); doTest(fileName); } @TestMetadata("NsVal.kt") public void testNsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); doTest(fileName); } @TestMetadata("NsVar.kt") public void testNsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); doTest(fileName); } @TestMetadata("OverrideClassVal.kt") public void testOverrideClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); doTest(fileName); } @TestMetadata("OverrideTraitVal.kt") public void testOverrideTraitVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); doTest(fileName); } @TestMetadata("PropFromSuperclass.kt") public void testPropFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); doTest(fileName); } @TestMetadata("TraitFinalVar.kt") public void testTraitFinalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); doTest(fileName); } @TestMetadata("TraitOpenVal.kt") public void testTraitOpenVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); doTest(fileName); } @TestMetadata("VarDelegationToTraitImpl.kt") public void testVarDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("VarWithDelegated.kt") public void testVarWithDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); doTest(fileName); } @@ -2757,66 +2757,66 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValParams.kt") public void testClassValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); doTest(fileName); } @TestMetadata("ClassValWithGet.kt") public void testClassValWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); doTest(fileName); } @TestMetadata("ClassVarModality.kt") public void testClassVarModality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); doTest(fileName); } @TestMetadata("ClassVarParams.kt") public void testClassVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); doTest(fileName); } @TestMetadata("ClassVarWithGet.kt") public void testClassVarWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVarWithSet.kt") public void testClassVarWithSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); doTest(fileName); } @TestMetadata("ExtValLong.kt") public void testExtValLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); doTest(fileName); } @TestMetadata("ExtVarLong.kt") public void testExtVarLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); doTest(fileName); } } @@ -2827,186 +2827,186 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") public void testAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); doTest(fileName); } @TestMetadata("AnyQ.kt") public void testAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); doTest(fileName); } @TestMetadata("ArrayOfInNumber.kt") public void testArrayOfInNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfInt.kt") public void testArrayOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); doTest(fileName); } @TestMetadata("ArrayOfInteger.kt") public void testArrayOfInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutNumber.kt") public void testArrayOfOutNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutT.kt") public void testArrayOfOutT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); doTest(fileName); } @TestMetadata("ArrayOfString.kt") public void testArrayOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); doTest(fileName); } @TestMetadata("Function1IntString.kt") public void testFunction1IntString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); doTest(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); doTest(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); doTest(fileName); } @TestMetadata("IntQ.kt") public void testIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); doTest(fileName); } @TestMetadata("jlInteger.kt") public void testJlInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); doTest(fileName); } @TestMetadata("jlIntegerQ.kt") public void testJlIntegerQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); doTest(fileName); } @TestMetadata("jlNumber.kt") public void testJlNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); doTest(fileName); } @TestMetadata("jlObject.kt") public void testJlObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); doTest(fileName); } @TestMetadata("jlObjectQ.kt") public void testJlObjectQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); doTest(fileName); } @TestMetadata("jlString.kt") public void testJlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); doTest(fileName); } @TestMetadata("jlStringQ.kt") public void testJlStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); doTest(fileName); } @TestMetadata("ListOfAny.kt") public void testListOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); doTest(fileName); } @TestMetadata("ListOfAnyQ.kt") public void testListOfAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); doTest(fileName); } @TestMetadata("ListOfStar.kt") public void testListOfStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); doTest(fileName); } @TestMetadata("ListOfString.kt") public void testListOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); doTest(fileName); } @TestMetadata("ListOfjlString.kt") public void testListOfjlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); doTest(fileName); } @TestMetadata("Nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); doTest(fileName); } @TestMetadata("NothingQ.kt") public void testNothingQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); doTest(fileName); } @TestMetadata("platform.kt") public void testPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); doTest(fileName); } @TestMetadata("String.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); doTest(fileName); } @TestMetadata("StringQ.kt") public void testStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); doTest(fileName); } @TestMetadata("Unit.kt") public void testUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); doTest(fileName); } } @@ -3016,72 +3016,72 @@ public class LoadKotlinWithTypeTableTestGenerated extends AbstractLoadKotlinWith @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadKotlinWithTypeTableTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InternalClass.kt") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); doTest(fileName); } @TestMetadata("InternalConstructor.kt") public void testInternalConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); doTest(fileName); } @TestMetadata("InternalTopLevelMembers.kt") public void testInternalTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); doTest(fileName); } @TestMetadata("PrivateClass.kt") public void testPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); doTest(fileName); } @TestMetadata("PrivateClassMembers.kt") public void testPrivateClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); doTest(fileName); } @TestMetadata("PrivateToThis.kt") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelFun.kt") public void testPrivateTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelVal.kt") public void testPrivateTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructorExplicitVisibility.kt") public void testPropertyInConstructorExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("TopLevelVarWithPrivateSetter.kt") public void testTopLevelVarWithPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index cc468af388b..4054b290b4a 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.types.ErrorUtils import org.junit.Assert import java.io.File @@ -85,7 +85,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { val modules = HashMap() for (dir in moduleDirs) { val name = dir.getName() - val kotlinFiles = JetTestUtils.loadToJetFiles(environment, dir.listFiles { it.extension == "kt" }?.toList().orEmpty()) + val kotlinFiles = KotlinTestUtils.loadToJetFiles(environment, dir.listFiles { it.extension == "kt" }?.toList().orEmpty()) val javaFilesScope = object : DelegatingGlobalSearchScope(GlobalSearchScope.allScope(project)) { override fun contains(file: VirtualFile): Boolean { if (file !in myBaseScope!!) return false diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java index 0ea771a0433..49ba6eeeb3a 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,108 +32,108 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { public void testAllFilesPresentInWriteSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayOfCharSequence.kt") public void testArrayOfCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfCharSequence.kt"); doTest(fileName); } @TestMetadata("ArrayOfInt.kt") public void testArrayOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfInt.kt"); doTest(fileName); } @TestMetadata("Comparable.kt") public void testComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Comparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/Comparable.kt"); doTest(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/Int.kt"); doTest(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/IntArray.kt"); doTest(fileName); } @TestMetadata("IntQ.kt") public void testIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/IntQ.kt"); doTest(fileName); } @TestMetadata("jlString.kt") public void testJlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/jlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/jlString.kt"); doTest(fileName); } @TestMetadata("ListOfCharSequence.kt") public void testListOfCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfCharSequence.kt"); doTest(fileName); } @TestMetadata("ListOfStar.kt") public void testListOfStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfStar.kt"); doTest(fileName); } @TestMetadata("MapEntry.kt") public void testMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/MapEntry.kt"); doTest(fileName); } @TestMetadata("MutableMapEntry.kt") public void testMutableMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MutableMapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/MutableMapEntry.kt"); doTest(fileName); } @TestMetadata("NonGeneric.kt") public void testNonGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/NonGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/NonGeneric.kt"); doTest(fileName); } @TestMetadata("StarProjectionInClass.kt") public void testStarProjectionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionInClass.kt"); doTest(fileName); } @TestMetadata("StarProjectionInSuper.kt") public void testStarProjectionInSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionInSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionInSuper.kt"); doTest(fileName); } @TestMetadata("StarProjectionOutsideClass.kt") public void testStarProjectionOutsideClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionOutsideClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/StarProjectionOutsideClass.kt"); doTest(fileName); } @TestMetadata("VarargCharSequence.kt") public void testVarargCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargCharSequence.kt"); doTest(fileName); } @TestMetadata("VarargGeneric.kt") public void testVarargGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargGeneric.kt"); doTest(fileName); } @@ -142,30 +142,30 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractWriteSignatureTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kArrayClassOfJClass.kt") public void testKArrayClassOfJClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kArrayClassOfJClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kArrayClassOfJClass.kt"); doTest(fileName); } @TestMetadata("kArrayClassOfKClass.kt") public void testKArrayClassOfKClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kArrayClassOfKClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kArrayClassOfKClass.kt"); doTest(fileName); } @TestMetadata("kClassBasic.kt") public void testKClassBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kClassBasic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kClassBasic.kt"); doTest(fileName); } @TestMetadata("kClassInt.kt") public void testKClassInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kClassInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/annotations/kClassInt.kt"); doTest(fileName); } } @@ -175,30 +175,30 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractWriteSignatureTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") public void testConstructor0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/Constructor0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/Constructor0.kt"); doTest(fileName); } @TestMetadata("ConstructorCollectionParameter.kt") public void testConstructorCollectionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParameter.kt") public void testConstructorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParameterAndValueParameterP.kt") public void testConstructorWithTypeParameterAndValueParameterP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt"); doTest(fileName); } } @@ -208,144 +208,144 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationSiteVariance extends AbstractWriteSignatureTest { public void testAllFilesPresentInDeclarationSiteVariance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/declarationSiteVariance"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/declarationSiteVariance"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunctionTwoTypeParameters.kt") public void testFunctionTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("InInInPosition.kt") public void testInInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt"); doTest(fileName); } @TestMetadata("InInOutPosition.kt") public void testInInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt"); doTest(fileName); } @TestMetadata("InOfInInInPosition.kt") public void testInOfInInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt"); doTest(fileName); } @TestMetadata("InOfInInOutPosition.kt") public void testInOfInInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt"); doTest(fileName); } @TestMetadata("InOfOutInInPosition.kt") public void testInOfOutInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt"); doTest(fileName); } @TestMetadata("InOfOutInOutPosition.kt") public void testInOfOutInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt"); doTest(fileName); } @TestMetadata("MappedSupertypeWithVariance.kt") public void testMappedSupertypeWithVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt"); doTest(fileName); } @TestMetadata("OutInField.kt") public void testOutInField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInField.kt"); doTest(fileName); } @TestMetadata("OutInInPosition.kt") public void testOutInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt"); doTest(fileName); } @TestMetadata("OutInOutPosition.kt") public void testOutInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt"); doTest(fileName); } @TestMetadata("OutOfInInInPosition.kt") public void testOutOfInInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt"); doTest(fileName); } @TestMetadata("OutOfInInOutPosition.kt") public void testOutOfInInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt"); doTest(fileName); } @TestMetadata("OutOfOutInInPosition.kt") public void testOutOfOutInInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt"); doTest(fileName); } @TestMetadata("OutOfOutInOutPosition.kt") public void testOutOfOutInOutPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt"); doTest(fileName); } @TestMetadata("PropertyGetterIn.kt") public void testPropertyGetterIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt"); doTest(fileName); } @TestMetadata("PropertyGetterOut.kt") public void testPropertyGetterOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt"); doTest(fileName); } @TestMetadata("PropertyGetterTwoParams.kt") public void testPropertyGetterTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt"); doTest(fileName); } @TestMetadata("PropertySetterIn.kt") public void testPropertySetterIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt"); doTest(fileName); } @TestMetadata("PropertySetterOut.kt") public void testPropertySetterOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt"); doTest(fileName); } @TestMetadata("SuperClassWithVariance.kt") public void testSuperClassWithVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt"); doTest(fileName); } @TestMetadata("SuperTraitWithVariance.kt") public void testSuperTraitWithVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt"); doTest(fileName); } @TestMetadata("SuperTypeWithVarianceInArguments.kt") public void testSuperTypeWithVarianceInArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt"); doTest(fileName); } } @@ -355,18 +355,18 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @RunWith(JUnit3RunnerWithInners.class) public static class Nothing extends AbstractWriteSignatureTest { public void testAllFilesPresentInNothing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/nothing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/nothing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nothing.kt"); doTest(fileName); } @TestMetadata("nullableNothing.kt") public void testNullableNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nullableNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nullableNothing.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index ac9730e9c56..834f517718e 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.PathUtil; @@ -164,14 +164,14 @@ public class ResolveDescriptorsFromExternalLibraries { if (jar != null) { jetCoreEnvironment = KotlinCoreEnvironment.createForTests( junk, - JetTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), jar + KotlinTestUtils.compilerConfigurationForTests( + ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, KotlinTestUtils.getAnnotationsJar(), jar ), EnvironmentConfigFiles.JVM_CONFIG_FILES); } else { CompilerConfiguration configuration = - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); jetCoreEnvironment = KotlinCoreEnvironment.createForTests(junk, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); if (!findRtJar().equals(jar)) { throw new RuntimeException("rt.jar mismatch: " + jar + ", " + findRtJar()); @@ -263,7 +263,7 @@ public class ResolveDescriptorsFromExternalLibraries { return file; } - JetTestUtils.mkdirs(file.getParentFile()); + KotlinTestUtils.mkdirs(file.getParentFile()); File tmp = new File(file.getPath() + "~"); diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 8c3f8db2619..750d4d7cf81 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.resolve.scopes.* import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies import org.jetbrains.kotlin.test.* -import org.jetbrains.kotlin.test.JetTestUtils.TestFileFactoryNoModules +import org.jetbrains.kotlin.test.KotlinTestUtils.TestFileFactoryNoModules import org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.Configuration @@ -110,7 +110,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi val fileName = file.getName() when { fileName.endsWith(".java") -> { - val sources = JetTestUtils.createTestFiles(fileName, text, object : TestFileFactoryNoModules() { + val sources = KotlinTestUtils.createTestFiles(fileName, text, object : TestFileFactoryNoModules() { override fun create(fileName: String, text: String, directives: Map): File { val targetFile = File(tmpdir, fileName) targetFile.writeText(adaptJavaSource(text)) @@ -120,10 +120,10 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi LoadDescriptorUtil.compileJavaWithAnnotationsJar(sources, tmpdir) } fileName.endsWith(".kt") -> { - val environment = JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( + val environment = KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea( myTestRootDisposable, ConfigurationKind.ALL, jdkKind ) - val jetFile = JetTestUtils.createFile(file.getPath(), text, environment.project) + val jetFile = KotlinTestUtils.createFile(file.getPath(), text, environment.project) GenerationUtils.compileFileGetClassFileFactoryForTest(jetFile, environment).writeAllTo(tmpdir) } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java index 349dc272d31..e75c1136ceb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.runtime; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +34,7 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @@ -42,48 +42,48 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); doTest(fileName); } @TestMetadata("AnnotatedMethod.kt") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); doTest(fileName); } @TestMetadata("AnnotationInAnnotationArguments.kt") public void testAnnotationInAnnotationArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); doTest(fileName); } @TestMetadata("EnumArgumentWithCustomToString.kt") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); doTest(fileName); } @TestMetadata("MultiDimensionalArrayMethod.kt") public void testMultiDimensionalArrayMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); doTest(fileName); } @TestMetadata("SimpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); doTest(fileName); } @TestMetadata("TargetedAnnotation.kt") public void testTargetedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); doTest(fileName); } @@ -92,54 +92,54 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClassMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectPropertyField.kt") public void testClassObjectPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); doTest(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); doTest(fileName); } } @@ -149,96 +149,96 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationInClassObject.kt") public void testAnnotationInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObjectInStaticNestedClass.kt") public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); doTest(fileName); } @TestMetadata("DataClass.kt") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); doTest(fileName); } @TestMetadata("DollarsInAnnotationName.kt") public void testDollarsInAnnotationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); doTest(fileName); } @TestMetadata("MultipleAnnotations.kt") public void testMultipleAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); doTest(fileName); } @TestMetadata("NestedAnnotation.kt") public void testNestedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); doTest(fileName); } @TestMetadata("Retention.kt") public void testRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); doTest(fileName); } @TestMetadata("WithArgument.kt") public void testWithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); doTest(fileName); } @TestMetadata("WithMultipleArguments.kt") public void testWithMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); doTest(fileName); } } @@ -248,54 +248,54 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("EnumArrayArgument.kt") public void testEnumArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); doTest(fileName); } @TestMetadata("StringArrayArgument.kt") public void testStringArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); doTest(fileName); } } @@ -305,78 +305,78 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); doTest(fileName); } @TestMetadata("EnumConstructor.kt") public void testEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); doTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctionInClass.kt") public void testExtensionFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); doTest(fileName); } @TestMetadata("ExtensionPropertySetter.kt") public void testExtensionPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); doTest(fileName); } @TestMetadata("FunctionInClass.kt") public void testFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); doTest(fileName); } @TestMetadata("FunctionInTrait.kt") public void testFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructor.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); doTest(fileName); } @TestMetadata("ManyAnnotations.kt") public void testManyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); doTest(fileName); } @TestMetadata("PropertySetterInClass.kt") public void testPropertySetterInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); doTest(fileName); } @TestMetadata("TopLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); doTest(fileName); } @TestMetadata("TopLevelPropertySetter.kt") public void testTopLevelPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); doTest(fileName); } } @@ -386,54 +386,54 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNameClass.kt") public void testExtensionsWithSameNameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNamePackage.kt") public void testExtensionsWithSameNamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); doTest(fileName); } @TestMetadata("NestedTrait.kt") public void testNestedTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); doTest(fileName); } @TestMetadata("TopLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); doTest(fileName); } @TestMetadata("TraitClassObject.kt") public void testTraitClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); doTest(fileName); } } @@ -443,42 +443,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Types extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ReceiverParameter.kt") public void testReceiverParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); doTest(fileName); } @TestMetadata("SimpleTypeAnnotation.kt") public void testSimpleTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("SupertypesAndBounds.kt") public void testSupertypesAndBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); doTest(fileName); } @TestMetadata("TypeAnnotationWithArguments.kt") public void testTypeAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotationWithArguments.kt") public void testTypeParameterAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); doTest(fileName); } } @@ -488,18 +488,18 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class WithUseSiteTarget extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInWithUseSiteTarget() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FieldTarget.kt") public void testFieldTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); doTest(fileName); } @TestMetadata("ReceiverTarget.kt") public void testReceiverTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); doTest(fileName); } } @@ -510,210 +510,210 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); doTest(fileName); } @TestMetadata("ClassInParam.kt") public void testClassInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); doTest(fileName); } @TestMetadata("ClassInnerClass.kt") public void testClassInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); doTest(fileName); } @TestMetadata("ClassMemberConflict.kt") public void testClassMemberConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); doTest(fileName); } @TestMetadata("ClassOutParam.kt") public void testClassOutParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); doTest(fileName); } @TestMetadata("ClassParam.kt") public void testClassParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam.kt") public void testClassParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam2.kt") public void testClassParamReferencesParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesSelf.kt") public void testClassParamReferencesSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassBound.kt") public void testClassParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassInterfaceBound.kt") public void testClassParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperInterfaceBound.kt") public void testClassParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams2.kt") public void testClassTwoParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); doTest(fileName); } @TestMetadata("EnumWithGenericConstructorParameter.kt") public void testEnumWithGenericConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); doTest(fileName); } @TestMetadata("EnumWithPrimitiveConstructorParameter.kt") public void testEnumWithPrimitiveConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); doTest(fileName); } @TestMetadata("InheritClassSimple.kt") public void testInheritClassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); doTest(fileName); } @TestMetadata("InheritClassWithParam.kt") public void testInheritClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); doTest(fileName); } @TestMetadata("InheritSubstitutedMethod.kt") public void testInheritSubstitutedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithFunctionParam.kt") public void testInheritTraitWithFunctionParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithParam.kt") public void testInheritTraitWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); doTest(fileName); } @TestMetadata("InnerClassExtendInnerClass.kt") public void testInnerClassExtendInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); doTest(fileName); } @TestMetadata("InnerGenericClass.kt") public void testInnerGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClass.kt") public void testNamedObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClassObject.kt") public void testNamedObjectInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInNamedObject.kt") public void testNamedObjectInNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt") public void testNamedObjectWithAnotherTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); doTest(fileName); } @TestMetadata("NestedClassExtendNestedClass.kt") public void testNestedClassExtendNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); doTest(fileName); } @TestMetadata("NestedGenericClass.kt") public void testNestedGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); doTest(fileName); } @TestMetadata("RecursiveGeneric.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); doTest(fileName); } @TestMetadata("SingleAbstractMethod.kt") public void testSingleAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); doTest(fileName); } @@ -722,42 +722,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanAbstractGetter.kt") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanVal.kt") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); doTest(fileName); } @TestMetadata("JavaBeanVar.kt") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); doTest(fileName); } @TestMetadata("JavaBeanVarOfGenericType.kt") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); doTest(fileName); } @TestMetadata("TwoSetters.kt") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); doTest(fileName); } } @@ -768,42 +768,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") public void testClassInParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("ClassParamUsedInFun.kt") public void testClassParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("FunDelegationToTraitImpl.kt") public void testFunDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("FunInParamSuper.kt") public void testFunInParamSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); doTest(fileName); } @TestMetadata("TraitFinalFun.kt") public void testTraitFinalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); doTest(fileName); } @TestMetadata("TraitOpenFun.kt") public void testTraitOpenFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); doTest(fileName); } } @@ -813,84 +813,84 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") public void testClassObjectDeclaresVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); doTest(fileName); } @TestMetadata("ClassObjectDeclaresVar.kt") public void testClassObjectDeclaresVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); doTest(fileName); } @TestMetadata("ClassObjectDefaultVisibility.kt") public void testClassObjectDefaultVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExplicitVisibility.kt") public void testClassObjectExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTrait.kt") public void testClassObjectExtendsTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTraitWithTP.kt") public void testClassObjectExtendsTraitWithTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); doTest(fileName); } @TestMetadata("classObjectInClassStaticFields.kt") public void testClassObjectInClassStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); doTest(fileName); } @TestMetadata("classObjectInTraitStaticFields.kt") public void testClassObjectInTraitStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); doTest(fileName); } @TestMetadata("ClassObjectPropertyInClass.kt") public void testClassObjectPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); doTest(fileName); } @TestMetadata("InnerClassInClassObject.kt") public void testInnerClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); doTest(fileName); } @TestMetadata("SimpleClassObject.kt") public void testSimpleClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); doTest(fileName); } } @@ -900,102 +900,102 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") public void testConstructor0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); doTest(fileName); } @TestMetadata("Constructor1.kt") public void testConstructor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); doTest(fileName); } @TestMetadata("Constructor1WithParamDefaultValue.kt") public void testConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("Constructor2WithOneParamDefaultValue.kt") public void testConstructor2WithOneParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("ConstructorCollectionParameter.kt") public void testConstructorCollectionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericDeep.kt") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericSimple.kt") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericUpperBound.kt") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoDefArgs.kt") public void testConstructorWithTwoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParameters.kt") public void testConstructorWithTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParameter.kt") public void testConstructorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt") public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructorWithDefArgs.kt") public void testInnerClassConstructorWithDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); doTest(fileName); } @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt") public void testPrivateConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); doTest(fileName); } @@ -1004,18 +1004,18 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") public void testConstructorNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); doTest(fileName); } @TestMetadata("ConstructorVararg.kt") public void testConstructorVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); doTest(fileName); } } @@ -1026,30 +1026,30 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class DataClass extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") public void testMixedComponents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); doTest(fileName); } @TestMetadata("OneVal.kt") public void testOneVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); doTest(fileName); } @TestMetadata("TwoVals.kt") public void testTwoVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); doTest(fileName); } @TestMetadata("TwoVars.kt") public void testTwoVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); doTest(fileName); } } @@ -1059,42 +1059,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumVisibility.kt") public void testEnumVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); doTest(fileName); } @TestMetadata("enumWithConstuctor.kt") public void testEnumWithConstuctor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); doTest(fileName); } @TestMetadata("enumWithInnerClasses.kt") public void testEnumWithInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerEnumExistingClassObject.kt") public void testInnerEnumExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); doTest(fileName); } } @@ -1104,210 +1104,210 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInFromLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); doTest(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.kt") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); doTest(fileName); } @TestMetadata("classObjectAnnotation.kt") public void testClassObjectAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); doTest(fileName); } @TestMetadata("ClassWithConstVal.kt") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); doTest(fileName); } @TestMetadata("ClassWithTypeP.kt") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.kt") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePP.kt") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefNext.kt") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelf.kt") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.kt") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); doTest(fileName); } @TestMetadata("FieldAsVar.kt") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); doTest(fileName); } @TestMetadata("FieldOfArrayType.kt") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); doTest(fileName); } @TestMetadata("FinalFieldAsVal.kt") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); doTest(fileName); } @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.kt") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); doTest(fileName); } @TestMetadata("MethodTypePOneUpperBound.kt") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); doTest(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.kt") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeP.kt") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePP.kt") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePRefClassP.kt") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); doTest(fileName); } @TestMetadata("MethosWithPRefTP.kt") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); doTest(fileName); } @TestMetadata("MyException.kt") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); doTest(fileName); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); doTest(fileName); } @TestMetadata("objectMembers.kt") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); doTest(fileName); } @TestMetadata("packageLevelObject.kt") public void testPackageLevelObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); doTest(fileName); } @TestMetadata("RemoveRedundantProjectionKind.kt") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); doTest(fileName); } @TestMetadata("TwoFields.kt") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); doTest(fileName); } @TestMetadata("UnboundWildcard.kt") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); doTest(fileName); } @@ -1317,101 +1317,101 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); doTest(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); doTest(fileName); } @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithParentTypeParams.kt") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithSeveralParams.kt") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithoutParams.kt") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); doTest(fileName); } @TestMetadata("CustomProjectionKind.kt") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); doTest(fileName); } @TestMetadata("MethodWithFunctionTypes.kt") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); doTest(fileName); } @TestMetadata("MethodWithGenerics.kt") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); doTest(fileName); } @TestMetadata("MethodWithMappedClasses.kt") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeParameters.kt") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); doTest(fileName); } @TestMetadata("MethodWithVararg.kt") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); doTest(fileName); } @TestMetadata("PropertyArrayTypes.kt") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); doTest(fileName); } @TestMetadata("PropertyComplexTypes.kt") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); doTest(fileName); } @TestMetadata("PropertySimpleType.kt") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); doTest(fileName); } @@ -1421,167 +1421,167 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD public static class Error extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); doTest(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); doTest(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); doTest(fileName); } @TestMetadata("ExtraUpperBound.kt") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); doTest(fileName); } @TestMetadata("MissingUpperBound.kt") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); doTest(fileName); } @TestMetadata("NoFieldTypeRef.kt") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); doTest(fileName); } @TestMetadata("NotVarargReplacedWithVararg.kt") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); doTest(fileName); } @TestMetadata("RedundantProjectionKind.kt") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("ReturnTypeMissing.kt") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); doTest(fileName); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); doTest(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.kt") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); doTest(fileName); } @TestMetadata("VarargReplacedWithNotVararg.kt") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); doTest(fileName); } @TestMetadata("WrongFieldInitializer.kt") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); doTest(fileName); } @TestMetadata("WrongFieldMutability.kt") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); doTest(fileName); } @TestMetadata("WrongFieldName.kt") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); doTest(fileName); } @TestMetadata("WrongMethodName.kt") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); doTest(fileName); } @TestMetadata("WrongProjectionKind.kt") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); doTest(fileName); } @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); doTest(fileName); } @TestMetadata("WrongTypeName1.kt") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); doTest(fileName); } @TestMetadata("WrongTypeName2.kt") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); doTest(fileName); } @TestMetadata("WrongTypeName3.kt") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.kt") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.kt") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); doTest(fileName); } @TestMetadata("WrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure2.kt") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); doTest(fileName); } @TestMetadata("WrongValueParametersCount.kt") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); doTest(fileName); } } @@ -1591,12 +1591,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") public void testPropagateTypeArgumentNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); doTest(fileName); } @@ -1605,162 +1605,162 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") public void testChangeProjectionKind1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); doTest(fileName); } @TestMetadata("ChangeProjectionKind2.kt") public void testChangeProjectionKind2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNotVararg.kt") public void testInheritNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargInteger.kt") public void testInheritNotVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargNotNull.kt") public void testInheritNotVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargPrimitive.kt") public void testInheritNotVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("InheritVararg.kt") public void testInheritVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); doTest(fileName); } @TestMetadata("InheritVarargInteger.kt") public void testInheritVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritVarargNotNull.kt") public void testInheritVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritVarargPrimitive.kt") public void testInheritVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("Kt3302.kt") public void testKt3302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); doTest(fileName); } @TestMetadata("MutableToReadOnly.kt") public void testMutableToReadOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); doTest(fileName); } @TestMetadata("NotNullToNullable.kt") public void testNotNullToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); doTest(fileName); } @TestMetadata("NullableToNotNull.kt") public void testNullableToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); doTest(fileName); } @TestMetadata("NullableToNotNullKotlinSignature.kt") public void testNullableToNotNullKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); doTest(fileName); } @TestMetadata("OverrideWithErasedParameter.kt") public void testOverrideWithErasedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); doTest(fileName); } @TestMetadata("ReadOnlyToMutable.kt") public void testReadOnlyToMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); doTest(fileName); } } @@ -1771,209 +1771,209 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD public static class Return extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNotNullSameJavaType.kt") public void testAddNotNullSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); doTest(fileName); } @TestMetadata("AddNullabilityJavaSubtype.kt") public void testAddNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType1.kt") public void testAddNullabilitySameGenericType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType2.kt") public void testAddNullabilitySameGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameJavaType.kt") public void testAddNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); doTest(fileName); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") public void testCantMakeImmutableInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("HalfSubstitutedTypeParameters.kt") public void testHalfSubstitutedTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityGenericSubclassSimple.kt") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityJavaSubtype.kt") public void testInheritNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameGenericType.kt") public void testInheritNullabilitySameGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameJavaType.kt") public void testInheritNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessOfArgument.kt") public void testInheritReadOnlinessOfArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSameClass.kt") public void testInheritReadOnlinessSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSubclass.kt") public void testInheritReadOnlinessSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); doTest(fileName); } @TestMetadata("SameProjectionKind.kt") public void testSameProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubclassOfCollection.kt") public void testSubclassOfCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); doTest(fileName); } @TestMetadata("SubclassOfMapEntry.kt") public void testSubclassOfMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesMutableAndNot.kt") public void testTwoSuperclassesMutableAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnSameJavaType.kt") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesSupplementNotNull.kt") public void testTwoSuperclassesSupplementNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClass.kt") public void testTypeParamOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClassSubstituted.kt") public void testTypeParamOfClassSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); doTest(fileName); } @TestMetadata("TypeParamOfFun.kt") public void testTypeParamOfFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); doTest(fileName); } } @@ -1983,60 +1983,60 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("TwoBounds.kt") public void testTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclasses.kt") public void testTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); doTest(fileName); } @TestMetadata("TwoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("UseParameterAsUpperBound.kt") public void testUseParameterAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBound.kt") public void testUseParameterInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); doTest(fileName); } } @@ -2048,24 +2048,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); doTest(fileName); } @TestMetadata("LoadIterator.kt") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); doTest(fileName); } @TestMetadata("Max.kt") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); doTest(fileName); } } @@ -2075,12 +2075,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); doTest(fileName); } } @@ -2090,36 +2090,36 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); doTest(fileName); } @TestMetadata("NotNullIntArray.kt") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); doTest(fileName); } @TestMetadata("NotNullMethod.kt") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); doTest(fileName); } @TestMetadata("NotNullObjectArray.kt") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); doTest(fileName); } @TestMetadata("NotNullParameter.kt") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); doTest(fileName); } } @@ -2130,72 +2130,72 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Assert.kt") public void testAssert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); doTest(fileName); } @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); doTest(fileName); } @TestMetadata("InfixKeyword.kt") public void testInfixKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt") public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); doTest(fileName); } @TestMetadata("InheritValAndVar.kt") public void testInheritValAndVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); doTest(fileName); } @TestMetadata("InheritValsDifferentTypes.kt") public void testInheritValsDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); doTest(fileName); } @TestMetadata("NoSamAdapter.kt") public void testNoSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); doTest(fileName); } @TestMetadata("NoSamConstructor.kt") public void testNoSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); doTest(fileName); } @TestMetadata("OperatorKeyword.kt") public void testOperatorKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); doTest(fileName); } @TestMetadata("PropagateDeepSubclass.kt") public void testPropagateDeepSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); doTest(fileName); } @TestMetadata("PropagateSubclassOfComparable.kt") public void testPropagateSubclassOfComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); doTest(fileName); } @@ -2204,66 +2204,66 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") public void testFunGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); doTest(fileName); } @TestMetadata("FunParamParam.kt") public void testFunParamParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); doTest(fileName); } @TestMetadata("FunParamParamErased.kt") public void testFunParamParamErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); doTest(fileName); } @TestMetadata("FunParamReferencesParam.kt") public void testFunParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("FunParamTwoUpperBounds.kt") public void testFunParamTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassBound.kt") public void testFunParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassInterfaceBound.kt") public void testFunParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperInterfaceBound.kt") public void testFunParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); doTest(fileName); } @TestMetadata("FunTwoTypeParams.kt") public void testFunTwoTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); doTest(fileName); } } @@ -2273,36 +2273,36 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") public void testFunClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunClassParamNullable.kt") public void testFunClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); doTest(fileName); } @TestMetadata("FunParamNullable.kt") public void testFunParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNotNull.kt") public void testReturnTypeClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNullable.kt") public void testReturnTypeClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); doTest(fileName); } } @@ -2312,102 +2312,102 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") public void testClassFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFoo.kt") public void testClassFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFooSetFoo.kt") public void testClassFunGetFooSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunSetFoo.kt") public void testClassFunSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); doTest(fileName); } @TestMetadata("ExtFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); doTest(fileName); } @TestMetadata("ExtFunInClass.kt") public void testExtFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); doTest(fileName); } @TestMetadata("FunDefaultArg.kt") public void testFunDefaultArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); doTest(fileName); } @TestMetadata("FunParamNotNull.kt") public void testFunParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunVarargInt.kt") public void testFunVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); doTest(fileName); } @TestMetadata("FunVarargInteger.kt") public void testFunVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); doTest(fileName); } @TestMetadata("ModifierAbstract.kt") public void testModifierAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); doTest(fileName); } @TestMetadata("ModifierOpen.kt") public void testModifierOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); doTest(fileName); } @TestMetadata("NsFun.kt") public void testNsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); doTest(fileName); } @TestMetadata("NsFunGetFoo.kt") public void testNsFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNotNull.kt") public void testReturnTypeNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNullable.kt") public void testReturnTypeNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); doTest(fileName); } } @@ -2417,24 +2417,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") public void testNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); doTest(fileName); } @TestMetadata("VarargInt.kt") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); doTest(fileName); } @TestMetadata("VarargString.kt") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); doTest(fileName); } } @@ -2445,12 +2445,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); doTest(fileName); } } @@ -2460,42 +2460,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class MemberOrder extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInMemberOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callablesNameClash.kt") public void testCallablesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); doTest(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); doTest(fileName); } @TestMetadata("extensionMembers.kt") public void testExtensionMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); doTest(fileName); } @TestMetadata("extensionPropertiesNameClash.kt") public void testExtensionPropertiesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); doTest(fileName); } @TestMetadata("topLevelCallables.kt") public void testTopLevelCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); doTest(fileName); } } @@ -2505,24 +2505,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Nested extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); doTest(fileName); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); doTest(fileName); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); doTest(fileName); } } @@ -2532,18 +2532,18 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("notnullTypeArgument.kt") public void testNotnullTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); doTest(fileName); } @TestMetadata("nullableTypeArgument.kt") public void testNullableTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); doTest(fileName); } } @@ -2553,204 +2553,204 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValAbstract.kt") public void testClassValAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); doTest(fileName); } @TestMetadata("CollectionSize.kt") public void testCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); doTest(fileName); } @TestMetadata("Const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); doTest(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); doTest(fileName); } @TestMetadata("ExtValClass.kt") public void testExtValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); doTest(fileName); } @TestMetadata("ExtValInClass.kt") public void testExtValInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); doTest(fileName); } @TestMetadata("ExtValInt.kt") public void testExtValInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequence.kt") public void testExtValIntCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequenceQ.kt") public void testExtValIntCharSequenceQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); doTest(fileName); } @TestMetadata("ExtValIntListQOfIntInClass.kt") public void testExtValIntListQOfIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTInClass.kt") public void testExtValIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTQInClass.kt") public void testExtValIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtValTIntInClass.kt") public void testExtValTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarClass.kt") public void testExtVarClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInClass.kt") public void testExtVarInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInt.kt") public void testExtVarInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTInClass.kt") public void testExtVarIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTQInClass.kt") public void testExtVarIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarMapPQInt.kt") public void testExtVarMapPQInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); doTest(fileName); } @TestMetadata("ExtVarTIntInClass.kt") public void testExtVarTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarTQIntInClass.kt") public void testExtVarTQIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarl.kt") public void testExtVarl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); doTest(fileName); } @TestMetadata("NsVal.kt") public void testNsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); doTest(fileName); } @TestMetadata("NsVar.kt") public void testNsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); doTest(fileName); } @TestMetadata("OverrideClassVal.kt") public void testOverrideClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); doTest(fileName); } @TestMetadata("OverrideTraitVal.kt") public void testOverrideTraitVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); doTest(fileName); } @TestMetadata("PropFromSuperclass.kt") public void testPropFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); doTest(fileName); } @TestMetadata("TraitFinalVar.kt") public void testTraitFinalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); doTest(fileName); } @TestMetadata("TraitOpenVal.kt") public void testTraitOpenVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); doTest(fileName); } @TestMetadata("VarDelegationToTraitImpl.kt") public void testVarDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("VarWithDelegated.kt") public void testVarWithDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); doTest(fileName); } @@ -2759,66 +2759,66 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValParams.kt") public void testClassValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); doTest(fileName); } @TestMetadata("ClassValWithGet.kt") public void testClassValWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); doTest(fileName); } @TestMetadata("ClassVarModality.kt") public void testClassVarModality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); doTest(fileName); } @TestMetadata("ClassVarParams.kt") public void testClassVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); doTest(fileName); } @TestMetadata("ClassVarWithGet.kt") public void testClassVarWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVarWithSet.kt") public void testClassVarWithSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); doTest(fileName); } @TestMetadata("ExtValLong.kt") public void testExtValLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); doTest(fileName); } @TestMetadata("ExtVarLong.kt") public void testExtVarLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); doTest(fileName); } } @@ -2829,186 +2829,186 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") public void testAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); doTest(fileName); } @TestMetadata("AnyQ.kt") public void testAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); doTest(fileName); } @TestMetadata("ArrayOfInNumber.kt") public void testArrayOfInNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfInt.kt") public void testArrayOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); doTest(fileName); } @TestMetadata("ArrayOfInteger.kt") public void testArrayOfInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutNumber.kt") public void testArrayOfOutNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutT.kt") public void testArrayOfOutT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); doTest(fileName); } @TestMetadata("ArrayOfString.kt") public void testArrayOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); doTest(fileName); } @TestMetadata("Function1IntString.kt") public void testFunction1IntString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); doTest(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); doTest(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); doTest(fileName); } @TestMetadata("IntQ.kt") public void testIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); doTest(fileName); } @TestMetadata("jlInteger.kt") public void testJlInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); doTest(fileName); } @TestMetadata("jlIntegerQ.kt") public void testJlIntegerQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); doTest(fileName); } @TestMetadata("jlNumber.kt") public void testJlNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); doTest(fileName); } @TestMetadata("jlObject.kt") public void testJlObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); doTest(fileName); } @TestMetadata("jlObjectQ.kt") public void testJlObjectQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); doTest(fileName); } @TestMetadata("jlString.kt") public void testJlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); doTest(fileName); } @TestMetadata("jlStringQ.kt") public void testJlStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); doTest(fileName); } @TestMetadata("ListOfAny.kt") public void testListOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); doTest(fileName); } @TestMetadata("ListOfAnyQ.kt") public void testListOfAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); doTest(fileName); } @TestMetadata("ListOfStar.kt") public void testListOfStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); doTest(fileName); } @TestMetadata("ListOfString.kt") public void testListOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); doTest(fileName); } @TestMetadata("ListOfjlString.kt") public void testListOfjlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); doTest(fileName); } @TestMetadata("Nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); doTest(fileName); } @TestMetadata("NothingQ.kt") public void testNothingQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); doTest(fileName); } @TestMetadata("platform.kt") public void testPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); doTest(fileName); } @TestMetadata("String.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); doTest(fileName); } @TestMetadata("StringQ.kt") public void testStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); doTest(fileName); } @TestMetadata("Unit.kt") public void testUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); doTest(fileName); } } @@ -3018,72 +3018,72 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InternalClass.kt") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); doTest(fileName); } @TestMetadata("InternalConstructor.kt") public void testInternalConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); doTest(fileName); } @TestMetadata("InternalTopLevelMembers.kt") public void testInternalTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); doTest(fileName); } @TestMetadata("PrivateClass.kt") public void testPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); doTest(fileName); } @TestMetadata("PrivateClassMembers.kt") public void testPrivateClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); doTest(fileName); } @TestMetadata("PrivateToThis.kt") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelFun.kt") public void testPrivateTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelVal.kt") public void testPrivateTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructorExplicitVisibility.kt") public void testPropertyInConstructorExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("TopLevelVarWithPrivateSetter.kt") public void testTopLevelVarWithPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); doTest(fileName); } } @@ -3094,258 +3094,258 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJava extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInCompiledJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true, "sam", "kotlinSignature/propagation"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true, "sam", "kotlinSignature/propagation"); } @TestMetadata("ArrayTypeVariance.java") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java"); doTest(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.java") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java"); doTest(fileName); } @TestMetadata("ClassWithConstVal.java") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java"); doTest(fileName); } @TestMetadata("ClassWithTypeP.java") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java"); doTest(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.java") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java"); doTest(fileName); } @TestMetadata("ClassWithTypePP.java") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java"); doTest(fileName); } @TestMetadata("ClassWithTypePRefNext.java") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelf.java") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.java") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java"); doTest(fileName); } @TestMetadata("FieldAsVar.java") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldAsVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldAsVar.java"); doTest(fileName); } @TestMetadata("FieldOfArrayType.java") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java"); doTest(fileName); } @TestMetadata("FinalFieldAsVal.java") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.java") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.java") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java"); doTest(fileName); } @TestMetadata("InnerClass.java") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClass.java"); doTest(fileName); } @TestMetadata("InnerClassReferencesOuterTP.java") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java"); doTest(fileName); } @TestMetadata("InnerClassesInGeneric.java") public void testInnerClassesInGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java"); doTest(fileName); } @TestMetadata("InnerOfGeneric.java") public void testInnerOfGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java"); doTest(fileName); } @TestMetadata("IntrinsicCompanionObject.java") public void testIntrinsicCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/IntrinsicCompanionObject.java"); doTest(fileName); } @TestMetadata("MethodReferencesOuterClassTP.java") public void testMethodReferencesOuterClassTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java"); doTest(fileName); } @TestMetadata("MethodTypePOneUpperBound.java") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java"); doTest(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.java") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java"); doTest(fileName); } @TestMetadata("MethodWithTypeP.java") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java"); doTest(fileName); } @TestMetadata("MethodWithTypePP.java") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java"); doTest(fileName); } @TestMetadata("MethodWithTypePRefClassP.java") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java"); doTest(fileName); } @TestMetadata("MethosWithPRefTP.java") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java"); doTest(fileName); } @TestMetadata("MyException.java") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MyException.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MyException.java"); doTest(fileName); } @TestMetadata("NestedClass.java") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/NestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/NestedClass.java"); doTest(fileName); } @TestMetadata("OverrideMethod.java") public void testOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/OverrideMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/OverrideMethod.java"); doTest(fileName); } @TestMetadata("PackageLocalVisibility.java") public void testPackageLocalVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java"); doTest(fileName); } @TestMetadata("PrivateMembers.java") public void testPrivateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembers.java"); doTest(fileName); } @TestMetadata("PrivateMembersInHierarchy.java") public void testPrivateMembersInHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java"); doTest(fileName); } @TestMetadata("RawTypeWithUpperBound.java") public void testRawTypeWithUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java"); doTest(fileName); } @TestMetadata("RawUpperBound.java") public void testRawUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawUpperBound.java"); doTest(fileName); } @TestMetadata("RecursiveRawUpperBound.java") public void testRecursiveRawUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java"); doTest(fileName); } @TestMetadata("RecursiveWildcardUpperBound.java") public void testRecursiveWildcardUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java"); doTest(fileName); } @TestMetadata("RemoveRedundantProjectionKind.java") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/Simple.java"); doTest(fileName); } @TestMetadata("SubclassFromNested.java") public void testSubclassFromNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/SubclassFromNested.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/SubclassFromNested.java"); doTest(fileName); } @TestMetadata("TwoFields.java") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/TwoFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/TwoFields.java"); doTest(fileName); } @TestMetadata("UnboundWildcard.java") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/UnboundWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/UnboundWildcard.java"); doTest(fileName); } @TestMetadata("WildcardBounds.java") public void testWildcardBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/WildcardBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/WildcardBounds.java"); doTest(fileName); } @@ -3354,186 +3354,186 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotatedAnnotation.java") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java"); doTest(fileName); } @TestMetadata("AnnotatedConstructor.java") public void testAnnotatedConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedConstructor.java"); doTest(fileName); } @TestMetadata("AnnotatedField.java") public void testAnnotatedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.java"); doTest(fileName); } @TestMetadata("AnnotatedMethod.java") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java"); doTest(fileName); } @TestMetadata("AnnotatedValueParameter.java") public void testAnnotatedValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.java"); doTest(fileName); } @TestMetadata("AnnotationInParam.java") public void testAnnotationInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java"); doTest(fileName); } @TestMetadata("AnnotationRetentions.java") public void testAnnotationRetentions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.java"); doTest(fileName); } @TestMetadata("AnnotationTargets.java") public void testAnnotationTargets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.java"); doTest(fileName); } @TestMetadata("ArithmeticExpressionInParam.java") public void testArithmeticExpressionInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java"); doTest(fileName); } @TestMetadata("ArrayOfEnumInParam.java") public void testArrayOfEnumInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java"); doTest(fileName); } @TestMetadata("ArrayOfStringInParam.java") public void testArrayOfStringInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java"); doTest(fileName); } @TestMetadata("ClassObjectArrayInParam.java") public void testClassObjectArrayInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java"); doTest(fileName); } @TestMetadata("ClassObjectInParam.java") public void testClassObjectInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java"); doTest(fileName); } @TestMetadata("ClassObjectInParamRaw.java") public void testClassObjectInParamRaw() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.java"); doTest(fileName); } @TestMetadata("ClassObjectInParamVariance.java") public void testClassObjectInParamVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.java"); doTest(fileName); } @TestMetadata("CustomAnnotation.java") public void testCustomAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java"); doTest(fileName); } @TestMetadata("CustomAnnotationWithDefaultParameter.java") public void testCustomAnnotationWithDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java"); doTest(fileName); } @TestMetadata("EmptyArrayInParam.java") public void testEmptyArrayInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java"); doTest(fileName); } @TestMetadata("EnumArgumentWithCustomToString.java") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.java"); doTest(fileName); } @TestMetadata("EnumConstructorParameter.java") public void testEnumConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.java"); doTest(fileName); } @TestMetadata("EnumInParam.java") public void testEnumInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java"); doTest(fileName); } @TestMetadata("JavaDocDeprecated.java") public void testJavaDocDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.java"); doTest(fileName); } @TestMetadata("NestedEnumArgument.java") public void testNestedEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.java"); doTest(fileName); } @TestMetadata("PrimitiveValueInParam.java") public void testPrimitiveValueInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java"); doTest(fileName); } @TestMetadata("RecursiveAnnotation.java") public void testRecursiveAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java"); doTest(fileName); } @TestMetadata("RecursiveAnnotation2.java") public void testRecursiveAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java"); doTest(fileName); } @TestMetadata("SimpleAnnotation.java") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java"); doTest(fileName); } @TestMetadata("StringConcatenationInParam.java") public void testStringConcatenationInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java"); doTest(fileName); } @TestMetadata("StringConstantInParam.java") public void testStringConstantInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java"); doTest(fileName); } @TestMetadata("StringInParam.java") public void testStringInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java"); doTest(fileName); } } @@ -3543,24 +3543,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConstructorGenericDeep.java") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java"); doTest(fileName); } @TestMetadata("ConstructorGenericSimple.java") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java"); doTest(fileName); } @TestMetadata("ConstructorGenericUpperBound.java") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java"); doTest(fileName); } } @@ -3570,24 +3570,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/enum"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("EnumMembers.java") public void testEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumMembers.java"); doTest(fileName); } @TestMetadata("EnumWithSpecializedEntry.java") public void testEnumWithSpecializedEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/EnumWithSpecializedEntry.java"); doTest(fileName); } @TestMetadata("JavaEnum.java") public void testJavaEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/JavaEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/enum/JavaEnum.java"); doTest(fileName); } } @@ -3597,42 +3597,42 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("DifferentGetterAndSetter.java") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java"); doTest(fileName); } @TestMetadata("JavaBeanAbstractGetter.java") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java"); doTest(fileName); } @TestMetadata("JavaBeanVal.java") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java"); doTest(fileName); } @TestMetadata("JavaBeanVar.java") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java"); doTest(fileName); } @TestMetadata("JavaBeanVarOfGenericType.java") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java"); doTest(fileName); } @TestMetadata("TwoSetters.java") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java"); doTest(fileName); } } @@ -3643,101 +3643,101 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AllBoundsInWhen.java") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java"); doTest(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true, "propagation"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature"), Pattern.compile("^(.+)\\.java$"), true, "propagation"); } @TestMetadata("ArrayType.java") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java"); doTest(fileName); } @TestMetadata("ConstructorWithNewTypeParams.java") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java"); doTest(fileName); } @TestMetadata("ConstructorWithParentTypeParams.java") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java"); doTest(fileName); } @TestMetadata("ConstructorWithSeveralParams.java") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java"); doTest(fileName); } @TestMetadata("ConstructorWithoutParams.java") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java"); doTest(fileName); } @TestMetadata("CustomProjectionKind.java") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java"); doTest(fileName); } @TestMetadata("MethodWithFunctionTypes.java") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java"); doTest(fileName); } @TestMetadata("MethodWithGenerics.java") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java"); doTest(fileName); } @TestMetadata("MethodWithMappedClasses.java") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java"); doTest(fileName); } @TestMetadata("MethodWithTypeParameters.java") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java"); doTest(fileName); } @TestMetadata("MethodWithVararg.java") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java"); doTest(fileName); } @TestMetadata("PropertyArrayTypes.java") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java"); doTest(fileName); } @TestMetadata("PropertyComplexTypes.java") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java"); doTest(fileName); } @TestMetadata("PropertySimpleType.java") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java"); doTest(fileName); } @TestMetadata("StarProjection.java") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java"); doTest(fileName); } @@ -3747,167 +3747,167 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD public static class Error extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AddingNullability.java") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java"); doTest(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConflictingProjectionKind.java") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java"); doTest(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.java") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java"); doTest(fileName); } @TestMetadata("ExtraUpperBound.java") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java"); doTest(fileName); } @TestMetadata("MissingUpperBound.java") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java"); doTest(fileName); } @TestMetadata("NoFieldTypeRef.java") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java"); doTest(fileName); } @TestMetadata("NotVarargReplacedWithVararg.java") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java"); doTest(fileName); } @TestMetadata("RedundantProjectionKind.java") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java"); doTest(fileName); } @TestMetadata("ReturnTypeMissing.java") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java"); doTest(fileName); } @TestMetadata("SyntaxError.java") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java"); doTest(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.java") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java"); doTest(fileName); } @TestMetadata("VarargReplacedWithNotVararg.java") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java"); doTest(fileName); } @TestMetadata("WrongFieldInitializer.java") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java"); doTest(fileName); } @TestMetadata("WrongFieldMutability.java") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java"); doTest(fileName); } @TestMetadata("WrongFieldName.java") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java"); doTest(fileName); } @TestMetadata("WrongMethodName.java") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java"); doTest(fileName); } @TestMetadata("WrongProjectionKind.java") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java"); doTest(fileName); } @TestMetadata("WrongReturnTypeStructure.java") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java"); doTest(fileName); } @TestMetadata("WrongTypeName1.java") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java"); doTest(fileName); } @TestMetadata("WrongTypeName2.java") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java"); doTest(fileName); } @TestMetadata("WrongTypeName3.java") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.java") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.java") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java"); doTest(fileName); } @TestMetadata("WrongTypeParametersCount.java") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure1.java") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure2.java") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java"); doTest(fileName); } @TestMetadata("WrongValueParametersCount.java") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java"); doTest(fileName); } } @@ -3918,24 +3918,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("LoadIterable.java") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterable.java"); doTest(fileName); } @TestMetadata("LoadIterator.java") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterator.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterator.java"); doTest(fileName); } @TestMetadata("Max.java") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/Max.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/Max.java"); doTest(fileName); } } @@ -3945,12 +3945,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ModalityOfFakeOverrides.java") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java"); doTest(fileName); } } @@ -3960,36 +3960,36 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Mutability extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInMutability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("LoadIterable.java") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java"); doTest(fileName); } @TestMetadata("LoadIterableWithConflict.java") public void testLoadIterableWithConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java"); doTest(fileName); } @TestMetadata("LoadIterableWithNullability.java") public void testLoadIterableWithNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java"); doTest(fileName); } @TestMetadata("LoadIterableWithPropagation.java") public void testLoadIterableWithPropagation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java"); doTest(fileName); } @TestMetadata("ReadOnlyExtendsWildcard.java") public void testReadOnlyExtendsWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.java"); doTest(fileName); } } @@ -3999,36 +3999,36 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("NotNullField.java") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java"); doTest(fileName); } @TestMetadata("NotNullIntArray.java") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java"); doTest(fileName); } @TestMetadata("NotNullMethod.java") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java"); doTest(fileName); } @TestMetadata("NotNullObjectArray.java") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java"); doTest(fileName); } @TestMetadata("NotNullParameter.java") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java"); doTest(fileName); } } @@ -4038,24 +4038,24 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedPackage extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInProtectedPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ProtectedPackageConstructor.java") public void testProtectedPackageConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java"); doTest(fileName); } @TestMetadata("ProtectedPackageFun.java") public void testProtectedPackageFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java"); doTest(fileName); } @TestMetadata("ProtectedPackageProperty.java") public void testProtectedPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java"); doTest(fileName); } } @@ -4065,12 +4065,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedStatic extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConstructorInProtectedStaticNestedClass.java") public void testConstructorInProtectedStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java"); doTest(fileName); } } @@ -4080,12 +4080,12 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Rendering extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInRendering() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/rendering"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/rendering"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Rendering.java") public void testRendering() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/rendering/Rendering.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/rendering/Rendering.java"); doTest(fileName); } } @@ -4095,66 +4095,66 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArraysInSubtypes.java") public void testArraysInSubtypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java"); doTest(fileName); } @TestMetadata("MethodTypeParameterErased.java") public void testMethodTypeParameterErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java"); doTest(fileName); } @TestMetadata("RawSuperType.java") public void testRawSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java"); doTest(fileName); } @TestMetadata("RawSuperTypeWithBound.java") public void testRawSuperTypeWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.java"); doTest(fileName); } @TestMetadata("RawSuperTypeWithRecursiveBound.java") public void testRawSuperTypeWithRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.java"); doTest(fileName); } @TestMetadata("RawSuperTypeWithRecursiveBoundMultipleParameters.java") public void testRawSuperTypeWithRecursiveBoundMultipleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.java"); doTest(fileName); } @TestMetadata("ReturnInnerSubclassOfSupersInner.java") public void testReturnInnerSubclassOfSupersInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java"); doTest(fileName); } @TestMetadata("SubclassWithRawType.java") public void testSubclassWithRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java"); doTest(fileName); } @TestMetadata("TwoSuperclassesInconsistentGenericTypes.java") public void testTwoSuperclassesInconsistentGenericTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java"); doTest(fileName); } @TestMetadata("TwoSuperclassesVarargAndNot.java") public void testTwoSuperclassesVarargAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java"); doTest(fileName); } } @@ -4164,66 +4164,66 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Static extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("DeeplyInnerClass.java") public void testDeeplyInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java"); doTest(fileName); } @TestMetadata("DeeplyNestedStatic.java") public void testDeeplyNestedStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java"); doTest(fileName); } @TestMetadata("Enum.java") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Enum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Enum.java"); doTest(fileName); } @TestMetadata("InnerClass.java") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/InnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/InnerClass.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Simple.java"); doTest(fileName); } @TestMetadata("StaticFinal.java") public void testStaticFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticFinal.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticFinal.java"); doTest(fileName); } @TestMetadata("StaticMembersFromParentClass.java") public void testStaticMembersFromParentClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentClass.java"); doTest(fileName); } @TestMetadata("StaticMembersFromParentInterface.java") public void testStaticMembersFromParentInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersFromParentInterface.java"); doTest(fileName); } @TestMetadata("StaticMembersInEnum.java") public void testStaticMembersInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java"); doTest(fileName); } @TestMetadata("StaticMembersInEnumFromParents.java") public void testStaticMembersInEnumFromParents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnumFromParents.java"); doTest(fileName); } } @@ -4233,18 +4233,18 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("VarargInt.java") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java"); doTest(fileName); } @TestMetadata("VarargString.java") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargString.java"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargString.java"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java index acba9dc8603..ddbc96177dc 100644 --- a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer; import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.IOException; @@ -57,7 +57,7 @@ public abstract class AbstractModuleXmlParserTest extends TestCase { fail("Expected data file does not exist. A new file created: " + txtFile); } - JetTestUtils.assertEqualsToFile(txtFile, actual); + KotlinTestUtils.assertEqualsToFile(txtFile, actual); } private static String moduleToString(@NotNull Module module) { diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java index 0771fc21f2f..d14101421e5 100644 --- a/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.modules.xml; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,54 +32,54 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest { public void testAllFilesPresentInModules_xml() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/modules.xml"), Pattern.compile("^(.+)\\.xml$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/modules.xml"), Pattern.compile("^(.+)\\.xml$"), true); } @TestMetadata("allOnce.xml") public void testAllOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/allOnce.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/allOnce.xml"); doTest(fileName); } @TestMetadata("comments.xml") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/comments.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/comments.xml"); doTest(fileName); } @TestMetadata("empty.xml") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/empty.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/empty.xml"); doTest(fileName); } @TestMetadata("emptyModule.xml") public void testEmptyModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/emptyModule.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/emptyModule.xml"); doTest(fileName); } @TestMetadata("manyTimes.xml") public void testManyTimes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/manyTimes.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/manyTimes.xml"); doTest(fileName); } @TestMetadata("onlySources.xml") public void testOnlySources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/onlySources.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/onlySources.xml"); doTest(fileName); } @TestMetadata("twoModules.xml") public void testTwoModules() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/twoModules.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/twoModules.xml"); doTest(fileName); } @TestMetadata("typeTestModule.xml") public void testTypeTestModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/typeTestModule.xml"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/modules.xml/typeTestModule.xml"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java index 2d765b18b8a..a81b70fb756 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.parsing; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,886 +28,886 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetParsingTestGenerated extends AbstractJetParsingTest { +public class ParsingTestGenerated extends AbstractParsingTest { @TestMetadata("compiler/testData/psi") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Psi extends AbstractJetParsingTest { + public static class Psi extends AbstractParsingTest { @TestMetadata("AbsentInnerType.kt") public void testAbsentInnerType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AbsentInnerType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/AbsentInnerType.kt"); doParsingTest(fileName); } public void testAllFilesPresentInPsi() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("AnonymousInitializer.kt") public void testAnonymousInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AnonymousInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/AnonymousInitializer.kt"); doParsingTest(fileName); } @TestMetadata("AssertNotNull.kt") public void testAssertNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AssertNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/AssertNotNull.kt"); doParsingTest(fileName); } @TestMetadata("BabySteps.kt") public void testBabySteps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BabySteps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BabySteps.kt"); doParsingTest(fileName); } @TestMetadata("BabySteps_ERR.kt") public void testBabySteps_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BabySteps_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BabySteps_ERR.kt"); doParsingTest(fileName); } @TestMetadata("BackslashInString.kt") public void testBackslashInString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BackslashInString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BackslashInString.kt"); doParsingTest(fileName); } @TestMetadata("BlockCommentAtBeginningOfFile1.kt") public void testBlockCommentAtBeginningOfFile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt"); doParsingTest(fileName); } @TestMetadata("BlockCommentAtBeginningOfFile2.kt") public void testBlockCommentAtBeginningOfFile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt"); doParsingTest(fileName); } @TestMetadata("BlockCommentAtBeginningOfFile3.kt") public void testBlockCommentAtBeginningOfFile3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt"); doParsingTest(fileName); } @TestMetadata("BlockCommentAtBeginningOfFile4.kt") public void testBlockCommentAtBeginningOfFile4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt"); doParsingTest(fileName); } @TestMetadata("ByClauses.kt") public void testByClauses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ByClauses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ByClauses.kt"); doParsingTest(fileName); } @TestMetadata("CallWithManyClosures.kt") public void testCallWithManyClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/CallWithManyClosures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/CallWithManyClosures.kt"); doParsingTest(fileName); } @TestMetadata("CallsInWhen.kt") public void testCallsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/CallsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/CallsInWhen.kt"); doParsingTest(fileName); } @TestMetadata("CommentsBinding.kt") public void testCommentsBinding() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/CommentsBinding.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/CommentsBinding.kt"); doParsingTest(fileName); } @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Constructors.kt"); doParsingTest(fileName); } @TestMetadata("ControlStructures.kt") public void testControlStructures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ControlStructures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ControlStructures.kt"); doParsingTest(fileName); } @TestMetadata("DefaultKeyword.kt") public void testDefaultKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DefaultKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DefaultKeyword.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentAfterFileAnnotations.kt") public void testDocCommentAfterFileAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DocCommentAfterFileAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DocCommentAfterFileAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentForFirstDeclaration.kt") public void testDocCommentForFirstDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DocCommentForFirstDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DocCommentForFirstDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentOnPackageDirectiveLine.kt") public void testDocCommentOnPackageDirectiveLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DocCommentOnPackageDirectiveLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DocCommentOnPackageDirectiveLine.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentsBinding.kt") public void testDocCommentsBinding() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DocCommentsBinding.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DocCommentsBinding.kt"); doParsingTest(fileName); } @TestMetadata("DoubleColon.kt") public void testDoubleColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DoubleColon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DoubleColon.kt"); doParsingTest(fileName); } @TestMetadata("DuplicateAccessor.kt") public void testDuplicateAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DuplicateAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DuplicateAccessor.kt"); doParsingTest(fileName); } @TestMetadata("DynamicReceiver.kt") public void testDynamicReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DynamicReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DynamicReceiver.kt"); doParsingTest(fileName); } @TestMetadata("DynamicSoftKeyword.kt") public void testDynamicSoftKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DynamicSoftKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DynamicSoftKeyword.kt"); doParsingTest(fileName); } @TestMetadata("DynamicTypes.kt") public void testDynamicTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DynamicTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/DynamicTypes.kt"); doParsingTest(fileName); } @TestMetadata("EOLsInComments.kt") public void testEOLsInComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EOLsInComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EOLsInComments.kt"); doParsingTest(fileName); } @TestMetadata("EOLsOnRollback.kt") public void testEOLsOnRollback() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EOLsOnRollback.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EOLsOnRollback.kt"); doParsingTest(fileName); } @TestMetadata("EmptyFile.kt") public void testEmptyFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EmptyFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EmptyFile.kt"); doParsingTest(fileName); } @TestMetadata("EmptyName.kt") public void testEmptyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EmptyName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EmptyName.kt"); doParsingTest(fileName); } @TestMetadata("EnumCommas.kt") public void testEnumCommas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumCommas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumCommas.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntryCommaAnnotatedMember.kt") public void testEnumEntryCommaAnnotatedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaAnnotatedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaAnnotatedMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntryCommaInlineMember.kt") public void testEnumEntryCommaInlineMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaInlineMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaInlineMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntryCommaMember.kt") public void testEnumEntryCommaMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntryCommaPublicMember.kt") public void testEnumEntryCommaPublicMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaPublicMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryCommaPublicMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntrySemicolonInlineMember.kt") public void testEnumEntrySemicolonInlineMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySemicolonInlineMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySemicolonInlineMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntrySemicolonMember.kt") public void testEnumEntrySemicolonMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySemicolonMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySemicolonMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntrySpaceInlineMember.kt") public void testEnumEntrySpaceInlineMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySpaceInlineMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySpaceInlineMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntrySpaceMember.kt") public void testEnumEntrySpaceMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySpaceMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntrySpaceMember.kt"); doParsingTest(fileName); } @TestMetadata("EnumEntryTwoCommas.kt") public void testEnumEntryTwoCommas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryTwoCommas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumEntryTwoCommas.kt"); doParsingTest(fileName); } @TestMetadata("EnumIn.kt") public void testEnumIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumIn.kt"); doParsingTest(fileName); } @TestMetadata("EnumInline.kt") public void testEnumInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumInline.kt"); doParsingTest(fileName); } @TestMetadata("EnumInlinePublic.kt") public void testEnumInlinePublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumInlinePublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumInlinePublic.kt"); doParsingTest(fileName); } @TestMetadata("EnumMissingName.kt") public void testEnumMissingName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumMissingName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumMissingName.kt"); doParsingTest(fileName); } @TestMetadata("EnumOldConstructorSyntax.kt") public void testEnumOldConstructorSyntax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumOldConstructorSyntax.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumOldConstructorSyntax.kt"); doParsingTest(fileName); } @TestMetadata("EnumShortCommas.kt") public void testEnumShortCommas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumShortCommas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumShortCommas.kt"); doParsingTest(fileName); } @TestMetadata("EnumShortWithOverload.kt") public void testEnumShortWithOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumShortWithOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumShortWithOverload.kt"); doParsingTest(fileName); } @TestMetadata("EnumWithAnnotationKeyword.kt") public void testEnumWithAnnotationKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EnumWithAnnotationKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/EnumWithAnnotationKeyword.kt"); doParsingTest(fileName); } @TestMetadata("Enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Enums.kt"); doParsingTest(fileName); } @TestMetadata("Expressions_ERR.kt") public void testExpressions_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Expressions_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Expressions_ERR.kt"); doParsingTest(fileName); } @TestMetadata("ExtensionsWithQNReceiver.kt") public void testExtensionsWithQNReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ExtensionsWithQNReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ExtensionsWithQNReceiver.kt"); doParsingTest(fileName); } @TestMetadata("FileStart_ERR.kt") public void testFileStart_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FileStart_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FileStart_ERR.kt"); doParsingTest(fileName); } @TestMetadata("FloatingPointLiteral.kt") public void testFloatingPointLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FloatingPointLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FloatingPointLiteral.kt"); doParsingTest(fileName); } @TestMetadata("ForWithMultiDecl.kt") public void testForWithMultiDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ForWithMultiDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ForWithMultiDecl.kt"); doParsingTest(fileName); } @TestMetadata("FunctionCalls.kt") public void testFunctionCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionCalls.kt"); doParsingTest(fileName); } @TestMetadata("FunctionExpressions.kt") public void testFunctionExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionExpressions.kt"); doParsingTest(fileName); } @TestMetadata("FunctionExpressions_ERR.kt") public void testFunctionExpressions_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionExpressions_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionExpressions_ERR.kt"); doParsingTest(fileName); } @TestMetadata("FunctionLiterals.kt") public void testFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals.kt"); doParsingTest(fileName); } @TestMetadata("FunctionLiterals_ERR.kt") public void testFunctionLiterals_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals_ERR.kt"); doParsingTest(fileName); } @TestMetadata("FunctionNoParameterList.kt") public void testFunctionNoParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionNoParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionNoParameterList.kt"); doParsingTest(fileName); } @TestMetadata("FunctionTypes.kt") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes.kt"); doParsingTest(fileName); } @TestMetadata("FunctionTypes_ERR.kt") public void testFunctionTypes_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes_ERR.kt"); doParsingTest(fileName); } @TestMetadata("Functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Functions.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsWithoutName.kt") public void testFunctionsWithoutName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionsWithoutName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionsWithoutName.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsWithoutName_ERR.kt") public void testFunctionsWithoutName_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionsWithoutName_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/FunctionsWithoutName_ERR.kt"); doParsingTest(fileName); } @TestMetadata("Functions_ERR.kt") public void testFunctions_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Functions_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Functions_ERR.kt"); doParsingTest(fileName); } @TestMetadata("HangOnLonelyModifier.kt") public void testHangOnLonelyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/HangOnLonelyModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/HangOnLonelyModifier.kt"); doParsingTest(fileName); } @TestMetadata("IfWithPropery.kt") public void testIfWithPropery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/IfWithPropery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/IfWithPropery.kt"); doParsingTest(fileName); } @TestMetadata("ImportSoftKW.kt") public void testImportSoftKW() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ImportSoftKW.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ImportSoftKW.kt"); doParsingTest(fileName); } @TestMetadata("Imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Imports.kt"); doParsingTest(fileName); } @TestMetadata("Imports_ERR.kt") public void testImports_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Imports_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Imports_ERR.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteFunctionLiteral.kt") public void testIncompleteFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/IncompleteFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/IncompleteFunctionLiteral.kt"); doParsingTest(fileName); } @TestMetadata("Inner.kt") public void testInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Inner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Inner.kt"); doParsingTest(fileName); } @TestMetadata("IntegerLiteral.kt") public void testIntegerLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/IntegerLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/IntegerLiteral.kt"); doParsingTest(fileName); } @TestMetadata("Interface.kt") public void testInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Interface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Interface.kt"); doParsingTest(fileName); } @TestMetadata("InterfaceWithEnumKeyword.kt") public void testInterfaceWithEnumKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/InterfaceWithEnumKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/InterfaceWithEnumKeyword.kt"); doParsingTest(fileName); } @TestMetadata("Labels.kt") public void testLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Labels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Labels.kt"); doParsingTest(fileName); } @TestMetadata("LineCommentAfterFileAnnotations.kt") public void testLineCommentAfterFileAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LineCommentAfterFileAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/LineCommentAfterFileAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("LineCommentForFirstDeclaration.kt") public void testLineCommentForFirstDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LineCommentForFirstDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/LineCommentForFirstDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("LocalDeclarations.kt") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LocalDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/LocalDeclarations.kt"); doParsingTest(fileName); } @TestMetadata("LongPackageName.kt") public void testLongPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LongPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/LongPackageName.kt"); doParsingTest(fileName); } @TestMetadata("ModifierAsSelector.kt") public void testModifierAsSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ModifierAsSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ModifierAsSelector.kt"); doParsingTest(fileName); } @TestMetadata("MultiVariableDeclarations.kt") public void testMultiVariableDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/MultiVariableDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/MultiVariableDeclarations.kt"); doParsingTest(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NamedClassObject.kt"); doParsingTest(fileName); } @TestMetadata("namelessObjectAsEnumMember.kt") public void testNamelessObjectAsEnumMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/namelessObjectAsEnumMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/namelessObjectAsEnumMember.kt"); doParsingTest(fileName); } @TestMetadata("NestedComments.kt") public void testNestedComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NestedComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NestedComments.kt"); doParsingTest(fileName); } @TestMetadata("NewLinesValidOperations.kt") public void testNewLinesValidOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NewLinesValidOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NewLinesValidOperations.kt"); doParsingTest(fileName); } @TestMetadata("NewlinesInParentheses.kt") public void testNewlinesInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NewlinesInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NewlinesInParentheses.kt"); doParsingTest(fileName); } @TestMetadata("NonTypeBeforeDotInBaseClass.kt") public void testNonTypeBeforeDotInBaseClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NonTypeBeforeDotInBaseClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NonTypeBeforeDotInBaseClass.kt"); doParsingTest(fileName); } @TestMetadata("NotIsAndNotIn.kt") public void testNotIsAndNotIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NotIsAndNotIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/NotIsAndNotIn.kt"); doParsingTest(fileName); } @TestMetadata("ObjectLiteralAsStatement.kt") public void testObjectLiteralAsStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ObjectLiteralAsStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ObjectLiteralAsStatement.kt"); doParsingTest(fileName); } @TestMetadata("ParameterNameMising.kt") public void testParameterNameMising() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ParameterNameMising.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ParameterNameMising.kt"); doParsingTest(fileName); } @TestMetadata("ParameterType.kt") public void testParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ParameterType.kt"); doParsingTest(fileName); } @TestMetadata("ParameterType_ERR.kt") public void testParameterType_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ParameterType_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ParameterType_ERR.kt"); doParsingTest(fileName); } @TestMetadata("Precedence.kt") public void testPrecedence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Precedence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Precedence.kt"); doParsingTest(fileName); } @TestMetadata("PrimaryConstructorModifiers_ERR.kt") public void testPrimaryConstructorModifiers_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt"); doParsingTest(fileName); } @TestMetadata("Properties.kt") public void testProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Properties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Properties.kt"); doParsingTest(fileName); } @TestMetadata("PropertiesFollowedByInitializers.kt") public void testPropertiesFollowedByInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PropertiesFollowedByInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/PropertiesFollowedByInitializers.kt"); doParsingTest(fileName); } @TestMetadata("Properties_ERR.kt") public void testProperties_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Properties_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Properties_ERR.kt"); doParsingTest(fileName); } @TestMetadata("QuotedIdentifiers.kt") public void testQuotedIdentifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/QuotedIdentifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/QuotedIdentifiers.kt"); doParsingTest(fileName); } @TestMetadata("RootPackage.kt") public void testRootPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/RootPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/RootPackage.kt"); doParsingTest(fileName); } @TestMetadata("SemicolonAfterIf.kt") public void testSemicolonAfterIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SemicolonAfterIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SemicolonAfterIf.kt"); doParsingTest(fileName); } @TestMetadata("semicolonBetweenDeclarations.kt") public void testSemicolonBetweenDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/semicolonBetweenDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/semicolonBetweenDeclarations.kt"); doParsingTest(fileName); } @TestMetadata("SimpleClassMembers.kt") public void testSimpleClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers.kt"); doParsingTest(fileName); } @TestMetadata("SimpleClassMembers_ERR.kt") public void testSimpleClassMembers_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers_ERR.kt"); doParsingTest(fileName); } @TestMetadata("SimpleExpressions.kt") public void testSimpleExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SimpleExpressions.kt"); doParsingTest(fileName); } @TestMetadata("SimpleModifiers.kt") public void testSimpleModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SimpleModifiers.kt"); doParsingTest(fileName); } @TestMetadata("SoftKeywords.kt") public void testSoftKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywords.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywords.kt"); doParsingTest(fileName); } @TestMetadata("SoftKeywordsInTypeArguments.kt") public void testSoftKeywordsInTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywordsInTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywordsInTypeArguments.kt"); doParsingTest(fileName); } @TestMetadata("StringTemplates.kt") public void testStringTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/StringTemplates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/StringTemplates.kt"); doParsingTest(fileName); } @TestMetadata("Super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/Super.kt"); doParsingTest(fileName); } @TestMetadata("ThisType.kt") public void testThisType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ThisType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/ThisType.kt"); doParsingTest(fileName); } @TestMetadata("TraitConstructor.kt") public void testTraitConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TraitConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TraitConstructor.kt"); doParsingTest(fileName); } @TestMetadata("TryRecovery.kt") public void testTryRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TryRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TryRecovery.kt"); doParsingTest(fileName); } @TestMetadata("TypeConstraints.kt") public void testTypeConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeConstraints.kt"); doParsingTest(fileName); } @TestMetadata("TypeDef.kt") public void testTypeDef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeDef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeDef.kt"); doParsingTest(fileName); } @TestMetadata("TypeDef_ERR.kt") public void testTypeDef_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeDef_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeDef_ERR.kt"); doParsingTest(fileName); } @TestMetadata("TypeExpressionAmbiguities_ERR.kt") public void testTypeExpressionAmbiguities_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt"); doParsingTest(fileName); } @TestMetadata("TypeParametersBeforeName.kt") public void testTypeParametersBeforeName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeParametersBeforeName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/TypeParametersBeforeName.kt"); doParsingTest(fileName); } @TestMetadata("When.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/When.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/When.kt"); doParsingTest(fileName); } @TestMetadata("When_ERR.kt") public void testWhen_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/When_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/When_ERR.kt"); doParsingTest(fileName); } @TestMetadata("compiler/testData/psi/annotation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Annotation extends AbstractJetParsingTest { + public static class Annotation extends AbstractParsingTest { public void testAllFilesPresentInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("AnnotatedExpressions.kt") public void testAnnotatedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/AnnotatedExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/AnnotatedExpressions.kt"); doParsingTest(fileName); } @TestMetadata("Annotations.kt") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/Annotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/Annotations.kt"); doParsingTest(fileName); } @TestMetadata("annotationsOnNullableTypes.kt") public void testAnnotationsOnNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/annotationsOnNullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/annotationsOnNullableTypes.kt"); doParsingTest(fileName); } @TestMetadata("AnnotationsOnPatterns.kt") public void testAnnotationsOnPatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/AnnotationsOnPatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/AnnotationsOnPatterns.kt"); doParsingTest(fileName); } @TestMetadata("Annotations_ERR.kt") public void testAnnotations_ERR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/Annotations_ERR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/Annotations_ERR.kt"); doParsingTest(fileName); } @TestMetadata("forParameters.kt") public void testForParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/forParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/forParameters.kt"); doParsingTest(fileName); } @TestMetadata("lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/lambda.kt"); doParsingTest(fileName); } @TestMetadata("lambdaRecovery.kt") public void testLambdaRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/lambdaRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/lambdaRecovery.kt"); doParsingTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/multiDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("noParameterYet.kt") public void testNoParameterYet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/noParameterYet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/noParameterYet.kt"); doParsingTest(fileName); } @TestMetadata("oldAnnotationsRecovery.kt") public void testOldAnnotationsRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/oldAnnotationsRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/oldAnnotationsRecovery.kt"); doParsingTest(fileName); } @TestMetadata("ShortAnnotations.kt") public void testShortAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/ShortAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/ShortAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("TypeAnnotations.kt") public void testTypeAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/TypeAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/TypeAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("compiler/testData/psi/annotation/at") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class At extends AbstractJetParsingTest { + public static class At extends AbstractParsingTest { public void testAllFilesPresentInAt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/at"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/at"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("annotationAtFileStart.kt") public void testAnnotationAtFileStart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/annotationAtFileStart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/annotationAtFileStart.kt"); doParsingTest(fileName); } @TestMetadata("annotationValueArgumentsAmbiguity.kt") public void testAnnotationValueArgumentsAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/annotationValueArgumentsAmbiguity.kt"); doParsingTest(fileName); } @TestMetadata("declarationsJustAtTyped.kt") public void testDeclarationsJustAtTyped() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/declarationsJustAtTyped.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/declarationsJustAtTyped.kt"); doParsingTest(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/enumEntries.kt"); doParsingTest(fileName); } @TestMetadata("expressionJustAtTyped.kt") public void testExpressionJustAtTyped() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/expressionJustAtTyped.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/expressionJustAtTyped.kt"); doParsingTest(fileName); } @TestMetadata("modifierAtFileStart.kt") public void testModifierAtFileStart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/modifierAtFileStart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/modifierAtFileStart.kt"); doParsingTest(fileName); } @TestMetadata("primaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/primaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/primaryConstructor.kt"); doParsingTest(fileName); } @TestMetadata("validDeclarations.kt") public void testValidDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/validDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/validDeclarations.kt"); doParsingTest(fileName); } @TestMetadata("validExpressions.kt") public void testValidExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/validExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/at/validExpressions.kt"); doParsingTest(fileName); } } @@ -915,20 +915,20 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/list") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class List extends AbstractJetParsingTest { + public static class List extends AbstractParsingTest { public void testAllFilesPresentInList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/list"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/list"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/list/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/list/basic.kt"); doParsingTest(fileName); } @TestMetadata("recovery.kt") public void testRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/list/recovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/list/recovery.kt"); doParsingTest(fileName); } } @@ -936,20 +936,20 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/modifiersMigration") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ModifiersMigration extends AbstractJetParsingTest { + public static class ModifiersMigration extends AbstractParsingTest { public void testAllFilesPresentInModifiersMigration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/modifiersMigration"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/modifiersMigration"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("newModifiers.kt") public void testNewModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/modifiersMigration/newModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/modifiersMigration/newModifiers.kt"); doParsingTest(fileName); } @TestMetadata("oldUsages.kt") public void testOldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/modifiersMigration/oldUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/modifiersMigration/oldUsages.kt"); doParsingTest(fileName); } } @@ -957,32 +957,32 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/options") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Options extends AbstractJetParsingTest { + public static class Options extends AbstractParsingTest { public void testAllFilesPresentInOptions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/options"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/options"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("annotationAsArg.kt") public void testAnnotationAsArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/annotationAsArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/annotationAsArg.kt"); doParsingTest(fileName); } @TestMetadata("annotationAsArgComplex.kt") public void testAnnotationAsArgComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/annotationAsArgComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/annotationAsArgComplex.kt"); doParsingTest(fileName); } @TestMetadata("java.kt") public void testJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/java.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/java.kt"); doParsingTest(fileName); } @TestMetadata("local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/options/local.kt"); doParsingTest(fileName); } } @@ -990,40 +990,40 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/targeted") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Targeted extends AbstractJetParsingTest { + public static class Targeted extends AbstractParsingTest { public void testAllFilesPresentInTargeted() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("compiler/testData/psi/annotation/targeted/onField") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnField extends AbstractJetParsingTest { + public static class OnField extends AbstractParsingTest { public void testAllFilesPresentInOnField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onField"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onField"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("fqName.kt") public void testFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/fqName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/fqName.kt"); doParsingTest(fileName); } @TestMetadata("inWrongPlace.kt") public void testInWrongPlace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/inWrongPlace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/inWrongPlace.kt"); doParsingTest(fileName); } @TestMetadata("manyInOneAnnotationBlock.kt") public void testManyInOneAnnotationBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/manyInOneAnnotationBlock.kt"); doParsingTest(fileName); } @TestMetadata("simpleFieldAnnotation.kt") public void testSimpleFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onField/simpleFieldAnnotation.kt"); doParsingTest(fileName); } } @@ -1031,56 +1031,56 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/targeted/onFile") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnFile extends AbstractJetParsingTest { + public static class OnFile extends AbstractParsingTest { public void testAllFilesPresentInOnFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onFile"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onFile"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("fileAnnotationInWrongPlace.kt") public void testFileAnnotationInWrongPlace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/fileAnnotationInWrongPlace.kt"); doParsingTest(fileName); } @TestMetadata("manyAnnotationBlocks.kt") public void testManyAnnotationBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/manyAnnotationBlocks.kt"); doParsingTest(fileName); } @TestMetadata("manyInOneAnnotationBlock.kt") public void testManyInOneAnnotationBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/manyInOneAnnotationBlock.kt"); doParsingTest(fileName); } @TestMetadata("nonFIleAnnotationBeforePackage.kt") public void testNonFIleAnnotationBeforePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/nonFIleAnnotationBeforePackage.kt"); doParsingTest(fileName); } @TestMetadata("single.kt") public void testSingle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/single.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/single.kt"); doParsingTest(fileName); } @TestMetadata("withoutFileAnnotationAndPackageDeclaration.kt") public void testWithoutFileAnnotationAndPackageDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutFileAnnotationAndPackageDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("withoutPackage.kt") public void testWithoutPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutPackage.kt"); doParsingTest(fileName); } @TestMetadata("withoutPackageWithSimpleAnnotation.kt") public void testWithoutPackageWithSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onFile/withoutPackageWithSimpleAnnotation.kt"); doParsingTest(fileName); } } @@ -1088,26 +1088,26 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnGetSetSparam extends AbstractJetParsingTest { + public static class OnGetSetSparam extends AbstractParsingTest { public void testAllFilesPresentInOnGetSetSparam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onGetSetSparam"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onGetSetSparam"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("inWrongPlace.kt") public void testInWrongPlace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.kt"); doParsingTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.kt"); doParsingTest(fileName); } @TestMetadata("twoAnnotationLists.kt") public void testTwoAnnotationLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.kt"); doParsingTest(fileName); } } @@ -1115,32 +1115,32 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation/targeted/onParam") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OnParam extends AbstractJetParsingTest { + public static class OnParam extends AbstractParsingTest { public void testAllFilesPresentInOnParam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onParam"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/annotation/targeted/onParam"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("modifiers.kt") public void testModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/modifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/modifiers.kt"); doParsingTest(fileName); } @TestMetadata("recovery.kt") public void testRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/recovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/recovery.kt"); doParsingTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/simple.kt"); doParsingTest(fileName); } @TestMetadata("targetExpected.kt") public void testTargetExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/targetExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/annotation/targeted/onParam/targetExpected.kt"); doParsingTest(fileName); } } @@ -1150,106 +1150,106 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Examples extends AbstractJetParsingTest { + public static class Examples extends AbstractParsingTest { public void testAllFilesPresentInExamples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("AnonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/AnonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/AnonymousObjects.kt"); doParsingTest(fileName); } @TestMetadata("BinaryTree.kt") public void testBinaryTree() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/BinaryTree.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/BinaryTree.kt"); doParsingTest(fileName); } @TestMetadata("BitArith.kt") public void testBitArith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/BitArith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/BitArith.kt"); doParsingTest(fileName); } @TestMetadata("Builder.kt") public void testBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Builder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/Builder.kt"); doParsingTest(fileName); } @TestMetadata("Color.kt") public void testColor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Color.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/Color.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsAndTypes.kt") public void testFunctionsAndTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/FunctionsAndTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/FunctionsAndTypes.kt"); doParsingTest(fileName); } @TestMetadata("Graph.kt") public void testGraph() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Graph.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/Graph.kt"); doParsingTest(fileName); } @TestMetadata("IPushPop.kt") public void testIPushPop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/IPushPop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/IPushPop.kt"); doParsingTest(fileName); } @TestMetadata("LINQ.kt") public void testLINQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/LINQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/LINQ.kt"); doParsingTest(fileName); } @TestMetadata("Queue.kt") public void testQueue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Queue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/Queue.kt"); doParsingTest(fileName); } @TestMetadata("Stack.kt") public void testStack() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Stack.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/Stack.kt"); doParsingTest(fileName); } @TestMetadata("UnionFind.kt") public void testUnionFind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/UnionFind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/UnionFind.kt"); doParsingTest(fileName); } @TestMetadata("UpdateOperation.kt") public void testUpdateOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/UpdateOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/UpdateOperation.kt"); doParsingTest(fileName); } @TestMetadata("With.kt") public void testWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/With.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/With.kt"); doParsingTest(fileName); } @TestMetadata("compiler/testData/psi/examples/array") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Array extends AbstractJetParsingTest { + public static class Array extends AbstractParsingTest { public void testAllFilesPresentInArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("MutableArray.kt") public void testMutableArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/array/MutableArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/array/MutableArray.kt"); doParsingTest(fileName); } } @@ -1257,80 +1257,80 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/collections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Collections extends AbstractJetParsingTest { + public static class Collections extends AbstractParsingTest { public void testAllFilesPresentInCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("ArrayList.kt") public void testArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ArrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ArrayList.kt"); doParsingTest(fileName); } @TestMetadata("HashMap.kt") public void testHashMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/HashMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/HashMap.kt"); doParsingTest(fileName); } @TestMetadata("IIterable.kt") public void testIIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterable.kt"); doParsingTest(fileName); } @TestMetadata("IIterator.kt") public void testIIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterator.kt"); doParsingTest(fileName); } @TestMetadata("IList.kt") public void testIList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IList.kt"); doParsingTest(fileName); } @TestMetadata("IMutableIterable.kt") public void testIMutableIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterable.kt"); doParsingTest(fileName); } @TestMetadata("IMutableIterator.kt") public void testIMutableIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterator.kt"); doParsingTest(fileName); } @TestMetadata("IMutableList.kt") public void testIMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableList.kt"); doParsingTest(fileName); } @TestMetadata("IMutableSet.kt") public void testIMutableSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableSet.kt"); doParsingTest(fileName); } @TestMetadata("ISet.kt") public void testISet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISet.kt"); doParsingTest(fileName); } @TestMetadata("ISized.kt") public void testISized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISized.kt"); doParsingTest(fileName); } @TestMetadata("LinkedList.kt") public void testLinkedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/LinkedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/LinkedList.kt"); doParsingTest(fileName); } } @@ -1338,14 +1338,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/io") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Io extends AbstractJetParsingTest { + public static class Io extends AbstractParsingTest { public void testAllFilesPresentInIo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("IOSamples.kt") public void testIOSamples() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/io/IOSamples.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/io/IOSamples.kt"); doParsingTest(fileName); } } @@ -1353,14 +1353,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/map") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Map extends AbstractJetParsingTest { + public static class Map extends AbstractParsingTest { public void testAllFilesPresentInMap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("IMap.kt") public void testIMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/map/IMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/map/IMap.kt"); doParsingTest(fileName); } } @@ -1368,26 +1368,26 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/priorityqueues") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Priorityqueues extends AbstractJetParsingTest { + public static class Priorityqueues extends AbstractParsingTest { public void testAllFilesPresentInPriorityqueues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("BinaryHeap.kt") public void testBinaryHeap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt"); doParsingTest(fileName); } @TestMetadata("IPriorityQueue.kt") public void testIPriorityQueue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt"); doParsingTest(fileName); } @TestMetadata("PriorityQueueAsPushPop.kt") public void testPriorityQueueAsPushPop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt"); doParsingTest(fileName); } } @@ -1395,20 +1395,20 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/util") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Util extends AbstractJetParsingTest { + public static class Util extends AbstractParsingTest { public void testAllFilesPresentInUtil() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("Comparison.kt") public void testComparison() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/util/Comparison.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/util/Comparison.kt"); doParsingTest(fileName); } @TestMetadata("IComparable.kt") public void testIComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/util/IComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/examples/util/IComparable.kt"); doParsingTest(fileName); } } @@ -1417,50 +1417,50 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/functionReceivers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionReceivers extends AbstractJetParsingTest { + public static class FunctionReceivers extends AbstractParsingTest { public void testAllFilesPresentInFunctionReceivers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("FunctionTypesWithFunctionReceivers.kt") public void testFunctionTypesWithFunctionReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsWithFunctionReceivers.kt") public void testFunctionsWithFunctionReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsWithFunctionReceiversAnnotations.kt") public void testFunctionsWithFunctionReceiversAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsWithFunctionReceiversRecovery.kt") public void testFunctionsWithFunctionReceiversRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt"); doParsingTest(fileName); } @TestMetadata("PropertiesWithFunctionReceivers.kt") public void testPropertiesWithFunctionReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt"); doParsingTest(fileName); } @TestMetadata("PropertiesWithFunctionReceiversAnnotations.kt") public void testPropertiesWithFunctionReceiversAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversAnnotations.kt"); doParsingTest(fileName); } @TestMetadata("PropertiesWithFunctionReceiversRecovery.kt") public void testPropertiesWithFunctionReceiversRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceiversRecovery.kt"); doParsingTest(fileName); } } @@ -1468,32 +1468,32 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/greatSyntacticShift") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class GreatSyntacticShift extends AbstractJetParsingTest { + public static class GreatSyntacticShift extends AbstractParsingTest { public void testAllFilesPresentInGreatSyntacticShift() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("functionLiterals.kt") public void testFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionLiterals.kt"); doParsingTest(fileName); } @TestMetadata("functionTypes.kt") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionTypes.kt"); doParsingTest(fileName); } @TestMetadata("FunctionTypesAsArguments.kt") public void testFunctionTypesAsArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt"); doParsingTest(fileName); } @TestMetadata("nullableTypes.kt") public void testNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/nullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/nullableTypes.kt"); doParsingTest(fileName); } } @@ -1501,140 +1501,140 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/kdoc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Kdoc extends AbstractJetParsingTest { + public static class Kdoc extends AbstractParsingTest { public void testAllFilesPresentInKdoc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("AtTags.kt") public void testAtTags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/AtTags.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/AtTags.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentAtBeginningOfFile1.kt") public void testDocCommentAtBeginningOfFile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentAtBeginningOfFile2.kt") public void testDocCommentAtBeginningOfFile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentAtBeginningOfFile3.kt") public void testDocCommentAtBeginningOfFile3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt"); doParsingTest(fileName); } @TestMetadata("DocCommentAtBeginningOfFile4.kt") public void testDocCommentAtBeginningOfFile4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt"); doParsingTest(fileName); } @TestMetadata("EndOnLeadingAsterisks.kt") public void testEndOnLeadingAsterisks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndOnLeadingAsterisks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndOnLeadingAsterisks.kt"); doParsingTest(fileName); } @TestMetadata("EndRightAfterText.kt") public void testEndRightAfterText() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndRightAfterText.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndRightAfterText.kt"); doParsingTest(fileName); } @TestMetadata("HttpLink.kt") public void testHttpLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/HttpLink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/HttpLink.kt"); doParsingTest(fileName); } @TestMetadata("Incomplete.kt") public void testIncomplete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Incomplete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Incomplete.kt"); doParsingTest(fileName); } @TestMetadata("Markdown.kt") public void testMarkdown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Markdown.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Markdown.kt"); doParsingTest(fileName); } @TestMetadata("MarkdownLinkWithError.kt") public void testMarkdownLinkWithError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownLinkWithError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownLinkWithError.kt"); doParsingTest(fileName); } @TestMetadata("MarkdownLinkWithLabel.kt") public void testMarkdownLinkWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownLinkWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownLinkWithLabel.kt"); doParsingTest(fileName); } @TestMetadata("MarkdownQualifiedName.kt") public void testMarkdownQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownQualifiedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/MarkdownQualifiedName.kt"); doParsingTest(fileName); } @TestMetadata("ParamTag.kt") public void testParamTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ParamTag.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ParamTag.kt"); doParsingTest(fileName); } @TestMetadata("ParamTagAtStart.kt") public void testParamTagAtStart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ParamTagAtStart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ParamTagAtStart.kt"); doParsingTest(fileName); } @TestMetadata("ReturnWithBrackets.kt") public void testReturnWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ReturnWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/ReturnWithBrackets.kt"); doParsingTest(fileName); } @TestMetadata("Sections.kt") public void testSections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Sections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Sections.kt"); doParsingTest(fileName); } @TestMetadata("SeeEmpty.kt") public void testSeeEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/SeeEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/SeeEmpty.kt"); doParsingTest(fileName); } @TestMetadata("SeeLink.kt") public void testSeeLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/SeeLink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/SeeLink.kt"); doParsingTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Simple.kt"); doParsingTest(fileName); } @TestMetadata("TextRightAfterLeadAsterisks.kt") public void testTextRightAfterLeadAsterisks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.kt"); doParsingTest(fileName); } @TestMetadata("TwoTags.kt") public void testTwoTags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/TwoTags.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/kdoc/TwoTags.kt"); doParsingTest(fileName); } } @@ -1642,32 +1642,32 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/newLabels") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NewLabels extends AbstractJetParsingTest { + public static class NewLabels extends AbstractParsingTest { public void testAllFilesPresentInNewLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/newLabels"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/newLabels"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/newLabels/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/newLabels/basic.kt"); doParsingTest(fileName); } @TestMetadata("oldSyntaxExpressions.kt") public void testOldSyntaxExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/newLabels/oldSyntaxExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/newLabels/oldSyntaxExpressions.kt"); doParsingTest(fileName); } @TestMetadata("recovery.kt") public void testRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/newLabels/recovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/newLabels/recovery.kt"); doParsingTest(fileName); } @TestMetadata("spaceBeforeLabelReference.kt") public void testSpaceBeforeLabelReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/newLabels/spaceBeforeLabelReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/newLabels/spaceBeforeLabelReference.kt"); doParsingTest(fileName); } } @@ -1675,74 +1675,74 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/packages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Packages extends AbstractJetParsingTest { + public static class Packages extends AbstractParsingTest { public void testAllFilesPresentInPackages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/packages"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/packages"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("PackageBlockFirst.kt") public void testPackageBlockFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageBlockFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageBlockFirst.kt"); doParsingTest(fileName); } @TestMetadata("PackageLeadingDotDoubleID.kt") public void testPackageLeadingDotDoubleID() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLeadingDotDoubleID.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLeadingDotDoubleID.kt"); doParsingTest(fileName); } @TestMetadata("PackageLongNameBetweenDots.kt") public void testPackageLongNameBetweenDots() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameBetweenDots.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameBetweenDots.kt"); doParsingTest(fileName); } @TestMetadata("PackageLongNameDoubleID.kt") public void testPackageLongNameDoubleID() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameDoubleID.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameDoubleID.kt"); doParsingTest(fileName); } @TestMetadata("PackageLongNameLeadingDot.kt") public void testPackageLongNameLeadingDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameLeadingDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameLeadingDot.kt"); doParsingTest(fileName); } @TestMetadata("PackageLongNameLeadingDoubleDot.kt") public void testPackageLongNameLeadingDoubleDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageLongNameLeadingDoubleDot.kt"); doParsingTest(fileName); } @TestMetadata("PackageModifiers.kt") public void testPackageModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageModifiers.kt"); doParsingTest(fileName); } @TestMetadata("PackageNameDoubleDot.kt") public void testPackageNameDoubleDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageNameDoubleDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageNameDoubleDot.kt"); doParsingTest(fileName); } @TestMetadata("PackageNameJustDot.kt") public void testPackageNameJustDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageNameJustDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageNameJustDot.kt"); doParsingTest(fileName); } @TestMetadata("PackageSimpleNameLeadingDot.kt") public void testPackageSimpleNameLeadingDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageSimpleNameLeadingDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageSimpleNameLeadingDot.kt"); doParsingTest(fileName); } @TestMetadata("PackageSimpleNameLeadingDoubleDot.kt") public void testPackageSimpleNameLeadingDoubleDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/packages/PackageSimpleNameLeadingDoubleDot.kt"); doParsingTest(fileName); } } @@ -1750,68 +1750,68 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/platformTypesRecovery") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PlatformTypesRecovery extends AbstractJetParsingTest { + public static class PlatformTypesRecovery extends AbstractParsingTest { public void testAllFilesPresentInPlatformTypesRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/platformTypesRecovery"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/platformTypesRecovery"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("Array.kt") public void testArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Array.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Array.kt"); doParsingTest(fileName); } @TestMetadata("BeforeDot.kt") public void testBeforeDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/BeforeDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/BeforeDot.kt"); doParsingTest(fileName); } @TestMetadata("Collections.kt") public void testCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Collections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Collections.kt"); doParsingTest(fileName); } @TestMetadata("FunctionsNotPlatform.kt") public void testFunctionsNotPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/FunctionsNotPlatform.kt"); doParsingTest(fileName); } @TestMetadata("MapEntry.kt") public void testMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/MapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/MapEntry.kt"); doParsingTest(fileName); } @TestMetadata("ParenthesizedNotPlatform.kt") public void testParenthesizedNotPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/ParenthesizedNotPlatform.kt"); doParsingTest(fileName); } @TestMetadata("Qualified.kt") public void testQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Qualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Qualified.kt"); doParsingTest(fileName); } @TestMetadata("QualifiedCollections.kt") public void testQualifiedCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/QualifiedCollections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/QualifiedCollections.kt"); doParsingTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/Simple.kt"); doParsingTest(fileName); } @TestMetadata("WrongWordInParentheses.kt") public void testWrongWordInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/platformTypesRecovery/WrongWordInParentheses.kt"); doParsingTest(fileName); } } @@ -1819,38 +1819,38 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/primaryConstructor") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PrimaryConstructor extends AbstractJetParsingTest { + public static class PrimaryConstructor extends AbstractParsingTest { public void testAllFilesPresentInPrimaryConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/primaryConstructor"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/primaryConstructor"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/local.kt"); doParsingTest(fileName); } @TestMetadata("nestedClassAmbiguity.kt") public void testNestedClassAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/nestedClassAmbiguity.kt"); doParsingTest(fileName); } @TestMetadata("recovery.kt") public void testRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/recovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/recovery.kt"); doParsingTest(fileName); } @TestMetadata("recoveryNestedClassAmbiguity.kt") public void testRecoveryNestedClassAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/recoveryNestedClassAmbiguity.kt"); doParsingTest(fileName); } @TestMetadata("valid.kt") public void testValid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/valid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/primaryConstructor/valid.kt"); doParsingTest(fileName); } } @@ -1858,74 +1858,74 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/propertyDelegate") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyDelegate extends AbstractJetParsingTest { + public static class PropertyDelegate extends AbstractParsingTest { public void testAllFilesPresentInPropertyDelegate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/propertyDelegate"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/propertyDelegate"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("BracketsInDelegate.kt") public void testBracketsInDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/BracketsInDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/BracketsInDelegate.kt"); doParsingTest(fileName); } @TestMetadata("DelegateAndInitializer.kt") public void testDelegateAndInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/DelegateAndInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/DelegateAndInitializer.kt"); doParsingTest(fileName); } @TestMetadata("GetterInSameLine.kt") public void testGetterInSameLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/GetterInSameLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/GetterInSameLine.kt"); doParsingTest(fileName); } @TestMetadata("LocalProperty.kt") public void testLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/LocalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/LocalProperty.kt"); doParsingTest(fileName); } @TestMetadata("OnlyBy.kt") public void testOnlyBy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/OnlyBy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/OnlyBy.kt"); doParsingTest(fileName); } @TestMetadata("PropertyInClass.kt") public void testPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyInClass.kt"); doParsingTest(fileName); } @TestMetadata("PropertyWithGetter.kt") public void testPropertyWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithGetter.kt"); doParsingTest(fileName); } @TestMetadata("PropertyWithInitializer.kt") public void testPropertyWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithInitializer.kt"); doParsingTest(fileName); } @TestMetadata("PropertyWithoutTypeRef.kt") public void testPropertyWithoutTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.kt"); doParsingTest(fileName); } @TestMetadata("TopLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TopLevelProperty.kt"); doParsingTest(fileName); } @TestMetadata("TwoProperties.kt") public void testTwoProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TwoProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TwoProperties.kt"); doParsingTest(fileName); } } @@ -1933,390 +1933,390 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Recovery extends AbstractJetParsingTest { + public static class Recovery extends AbstractParsingTest { @TestMetadata("AbsentLeftHandSide.kt") public void testAbsentLeftHandSide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/AbsentLeftHandSide.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/AbsentLeftHandSide.kt"); doParsingTest(fileName); } public void testAllFilesPresentInRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("BareVal.kt") public void testBareVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/BareVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/BareVal.kt"); doParsingTest(fileName); } @TestMetadata("BrokenFunctionSuperType.kt") public void testBrokenFunctionSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/BrokenFunctionSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/BrokenFunctionSuperType.kt"); doParsingTest(fileName); } @TestMetadata("CatchKeywordRBrace.kt") public void testCatchKeywordRBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/CatchKeywordRBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/CatchKeywordRBrace.kt"); doParsingTest(fileName); } @TestMetadata("CloseBraceAtTopLevel.kt") public void testCloseBraceAtTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/CloseBraceAtTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/CloseBraceAtTopLevel.kt"); doParsingTest(fileName); } @TestMetadata("DoWhileWithEmptyCondition.kt") public void testDoWhileWithEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithEmptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithEmptyCondition.kt"); doParsingTest(fileName); } @TestMetadata("DoWhileWithoutLPar.kt") public void testDoWhileWithoutLPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithoutLPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithoutLPar.kt"); doParsingTest(fileName); } @TestMetadata("ForEmptyParentheses.kt") public void testForEmptyParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyParentheses.kt"); doParsingTest(fileName); } @TestMetadata("ForEmptyWithoutBody.kt") public void testForEmptyWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyWithoutBody.kt"); doParsingTest(fileName); } @TestMetadata("ForNoBodyBeforeRBrace.kt") public void testForNoBodyBeforeRBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.kt"); doParsingTest(fileName); } @TestMetadata("ForRecovery.kt") public void testForRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForRecovery.kt"); doParsingTest(fileName); } @TestMetadata("ForWithOnlyOneLParInEOF.kt") public void testForWithOnlyOneLParInEOF() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.kt"); doParsingTest(fileName); } @TestMetadata("ForWithoutBodyInEOF.kt") public void testForWithoutBodyInEOF() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutBodyInEOF.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutBodyInEOF.kt"); doParsingTest(fileName); } @TestMetadata("ForWithoutLPar.kt") public void testForWithoutLPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLPar.kt"); doParsingTest(fileName); } @TestMetadata("ForWithoutLParInEOF.kt") public void testForWithoutLParInEOF() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLParInEOF.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLParInEOF.kt"); doParsingTest(fileName); } @TestMetadata("ForWithoutParamButWithRange.kt") public void testForWithoutParamButWithRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutParamButWithRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutParamButWithRange.kt"); doParsingTest(fileName); } @TestMetadata("ForWithoutRange.kt") public void testForWithoutRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutRange.kt"); doParsingTest(fileName); } @TestMetadata("IfKeywordRBrace.kt") public void testIfKeywordRBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfKeywordRBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfKeywordRBrace.kt"); doParsingTest(fileName); } @TestMetadata("IfWithEmptyCondition.kt") public void testIfWithEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithEmptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithEmptyCondition.kt"); doParsingTest(fileName); } @TestMetadata("IfWithoutLPar.kt") public void testIfWithoutLPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithoutLPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithoutLPar.kt"); doParsingTest(fileName); } @TestMetadata("ImportRecovery.kt") public void testImportRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ImportRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ImportRecovery.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteAccessor1.kt") public void testIncompleteAccessor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteAccessor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteAccessor1.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteAccessor2.kt") public void testIncompleteAccessor2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteAccessor2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteAccessor2.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteClassDeclaration.kt") public void testIncompleteClassDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteClassDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteClassDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteClassTypeParameters.kt") public void testIncompleteClassTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteClassTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteClassTypeParameters.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteForRBrace.kt") public void testIncompleteForRBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteForRBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteForRBrace.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteFun.kt") public void testIncompleteFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFun.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteFunDeclaration.kt") public void testIncompleteFunDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFunDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFunDeclaration.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteFunTypeParameters.kt") public void testIncompleteFunTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFunTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteFunTypeParameters.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteTypeParameters.kt") public void testIncompleteTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteTypeParameters.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteTypeRefWithPackageKeyword.kt") public void testIncompleteTypeRefWithPackageKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteTypeRefWithPackageKeyword.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteValTypeParameters.kt") public void testIncompleteValTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteValTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteValTypeParameters.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteWhenElse.kt") public void testIncompleteWhenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhenElse.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteWhere.kt") public void testIncompleteWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhere.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhere.kt"); doParsingTest(fileName); } @TestMetadata("IncompleteWhere2.kt") public void testIncompleteWhere2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhere2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/IncompleteWhere2.kt"); doParsingTest(fileName); } @TestMetadata("initRecovery.kt") public void testInitRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/initRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/initRecovery.kt"); doParsingTest(fileName); } @TestMetadata("InvalidCharAfterPropertyName.kt") public void testInvalidCharAfterPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/InvalidCharAfterPropertyName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/InvalidCharAfterPropertyName.kt"); doParsingTest(fileName); } @TestMetadata("InvalidCharInSingleLineLambda.kt") public void testInvalidCharInSingleLineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/InvalidCharInSingleLineLambda.kt"); doParsingTest(fileName); } @TestMetadata("kt2172.kt") public void testKt2172() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt2172.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt2172.kt"); doParsingTest(fileName); } @TestMetadata("kt5102.kt") public void testKt5102() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt5102.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt5102.kt"); doParsingTest(fileName); } @TestMetadata("MissingCommaInConstructorValueParameterList.kt") public void testMissingCommaInConstructorValueParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.kt"); doParsingTest(fileName); } @TestMetadata("MissingCommaInValueArgumentList.kt") public void testMissingCommaInValueArgumentList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueArgumentList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueArgumentList.kt"); doParsingTest(fileName); } @TestMetadata("MissingCommaInValueParameterList.kt") public void testMissingCommaInValueParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt"); doParsingTest(fileName); } @TestMetadata("MissingCommaInValueParameterListWithValOrVar.kt") public void testMissingCommaInValueParameterListWithValOrVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.kt"); doParsingTest(fileName); } @TestMetadata("NoArrowInWhen.kt") public void testNoArrowInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/NoArrowInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/NoArrowInWhen.kt"); doParsingTest(fileName); } @TestMetadata("PackageNewLineRecovery.kt") public void testPackageNewLineRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageNewLineRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageNewLineRecovery.kt"); doParsingTest(fileName); } @TestMetadata("PackageRecovery.kt") public void testPackageRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageRecovery.kt"); doParsingTest(fileName); } @TestMetadata("SameLineStatementRecovery.kt") public void testSameLineStatementRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/SameLineStatementRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/SameLineStatementRecovery.kt"); doParsingTest(fileName); } @TestMetadata("ValueParameterNoTypeRecovery.kt") public void testValueParameterNoTypeRecovery() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt"); doParsingTest(fileName); } @TestMetadata("WhenWithoutBraces.kt") public void testWhenWithoutBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhenWithoutBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhenWithoutBraces.kt"); doParsingTest(fileName); } @TestMetadata("WhileWithEmptyCondition.kt") public void testWhileWithEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithEmptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithEmptyCondition.kt"); doParsingTest(fileName); } @TestMetadata("WhileWithoutLPar.kt") public void testWhileWithoutLPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithoutLPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithoutLPar.kt"); doParsingTest(fileName); } @TestMetadata("WithWithoutInAndMultideclaration.kt") public void testWithWithoutInAndMultideclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.kt"); doParsingTest(fileName); } @TestMetadata("compiler/testData/psi/recovery/objects") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Objects extends AbstractJetParsingTest { + public static class Objects extends AbstractParsingTest { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("compiler/testData/psi/recovery/objects/declarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Declarations extends AbstractJetParsingTest { + public static class Declarations extends AbstractParsingTest { public void testAllFilesPresentInDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects/declarations"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects/declarations"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("ConstructorModifiers.kt") public void testConstructorModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/ConstructorModifiers.kt"); doParsingTest(fileName); } @TestMetadata("EmptyParentheses.kt") public void testEmptyParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/EmptyParentheses.kt"); doParsingTest(fileName); } @TestMetadata("Everything.kt") public void testEverything() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/Everything.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/Everything.kt"); doParsingTest(fileName); } @TestMetadata("FollowedByModifiers.kt") public void testFollowedByModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/FollowedByModifiers.kt"); doParsingTest(fileName); } @TestMetadata("ParametersInParentheses.kt") public void testParametersInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/ParametersInParentheses.kt"); doParsingTest(fileName); } @TestMetadata("TypeParametersAndParentheses.kt") public void testTypeParametersAndParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/TypeParametersAndParentheses.kt"); doParsingTest(fileName); } @TestMetadata("TypeParameterss.kt") public void testTypeParameterss() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/TypeParameterss.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/TypeParameterss.kt"); doParsingTest(fileName); } @TestMetadata("Where.kt") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/Where.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/declarations/Where.kt"); doParsingTest(fileName); } } @@ -2324,62 +2324,62 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery/objects/expressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Expressions extends AbstractJetParsingTest { + public static class Expressions extends AbstractParsingTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects/expressions"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/objects/expressions"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("ConstructorModifiers.kt") public void testConstructorModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ConstructorModifiers.kt"); doParsingTest(fileName); } @TestMetadata("ConstructorModifiersAndName.kt") public void testConstructorModifiersAndName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ConstructorModifiersAndName.kt"); doParsingTest(fileName); } @TestMetadata("EmptyParentheses.kt") public void testEmptyParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/EmptyParentheses.kt"); doParsingTest(fileName); } @TestMetadata("Everything.kt") public void testEverything() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/Everything.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/Everything.kt"); doParsingTest(fileName); } @TestMetadata("InFunction.kt") public void testInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/InFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/InFunction.kt"); doParsingTest(fileName); } @TestMetadata("ParametersInParentheses.kt") public void testParametersInParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/ParametersInParentheses.kt"); doParsingTest(fileName); } @TestMetadata("TypeParametersAndParentheses.kt") public void testTypeParametersAndParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/TypeParametersAndParentheses.kt"); doParsingTest(fileName); } @TestMetadata("TypeParameterss.kt") public void testTypeParameterss() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/TypeParameterss.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/TypeParameterss.kt"); doParsingTest(fileName); } @TestMetadata("Where.kt") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/Where.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/objects/expressions/Where.kt"); doParsingTest(fileName); } } @@ -2388,44 +2388,44 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery/qualifiedExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class QualifiedExpression extends AbstractJetParsingTest { + public static class QualifiedExpression extends AbstractParsingTest { public void testAllFilesPresentInQualifiedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/qualifiedExpression"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/qualifiedExpression"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("noQualifiedExpression.kt") public void testNoQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/noQualifiedExpression.kt"); doParsingTest(fileName); } @TestMetadata("noSafeQualifiedExpression.kt") public void testNoSafeQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/noSafeQualifiedExpression.kt"); doParsingTest(fileName); } @TestMetadata("qualifiedExpressionWithSelector.kt") public void testQualifiedExpressionWithSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithSelector.kt"); doParsingTest(fileName); } @TestMetadata("qualifiedExpressionWithoutSelector.kt") public void testQualifiedExpressionWithoutSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/qualifiedExpressionWithoutSelector.kt"); doParsingTest(fileName); } @TestMetadata("safeQualifiedExpressionWithSelector.kt") public void testSafeQualifiedExpressionWithSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithSelector.kt"); doParsingTest(fileName); } @TestMetadata("safeQualifiedExpressionWithoutSelector.kt") public void testSafeQualifiedExpressionWithoutSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/qualifiedExpression/safeQualifiedExpressionWithoutSelector.kt"); doParsingTest(fileName); } } @@ -2433,74 +2433,74 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery/unnamedParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnnamedParameter extends AbstractJetParsingTest { + public static class UnnamedParameter extends AbstractParsingTest { public void testAllFilesPresentInUnnamedParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/unnamedParameter"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/recovery/unnamedParameter"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("firstInFunction.kt") public void testFirstInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInFunction.kt"); doParsingTest(fileName); } @TestMetadata("firstInFunctionalType.kt") public void testFirstInFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInFunctionalType.kt"); doParsingTest(fileName); } @TestMetadata("firstInLambda.kt") public void testFirstInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInLambda.kt"); doParsingTest(fileName); } @TestMetadata("firstInPrimaryConstructor.kt") public void testFirstInPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInPrimaryConstructor.kt"); doParsingTest(fileName); } @TestMetadata("firstInSecondaryConstructor.kt") public void testFirstInSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInSecondaryConstructor.kt"); doParsingTest(fileName); } @TestMetadata("firstInSetter.kt") public void testFirstInSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/firstInSetter.kt"); doParsingTest(fileName); } @TestMetadata("secondInFunction.kt") public void testSecondInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInFunction.kt"); doParsingTest(fileName); } @TestMetadata("secondInFunctionalType.kt") public void testSecondInFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInFunctionalType.kt"); doParsingTest(fileName); } @TestMetadata("secondInLambda.kt") public void testSecondInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInLambda.kt"); doParsingTest(fileName); } @TestMetadata("secondInPrimaryConstructor.kt") public void testSecondInPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInPrimaryConstructor.kt"); doParsingTest(fileName); } @TestMetadata("secondInSecondaryConstructor.kt") public void testSecondInSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/recovery/unnamedParameter/secondInSecondaryConstructor.kt"); doParsingTest(fileName); } } @@ -2509,50 +2509,50 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/script") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Script extends AbstractJetParsingTest { + public static class Script extends AbstractParsingTest { public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/script"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/script"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("ComplexScript.kts") public void testComplexScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/ComplexScript.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/ComplexScript.kts"); doParsingTest(fileName); } @TestMetadata("Import.kts") public void testImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/Import.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/Import.kts"); doParsingTest(fileName); } @TestMetadata("manyAnnotationsOnFile.kts") public void testManyAnnotationsOnFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/manyAnnotationsOnFile.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/manyAnnotationsOnFile.kts"); doParsingTest(fileName); } @TestMetadata("Shebang.kts") public void testShebang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/Shebang.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/Shebang.kts"); doParsingTest(fileName); } @TestMetadata("ShebangIncorrect.kts") public void testShebangIncorrect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/ShebangIncorrect.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/ShebangIncorrect.kts"); doParsingTest(fileName); } @TestMetadata("SimpleScript.kts") public void testSimpleScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/SimpleScript.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/SimpleScript.kts"); doParsingTest(fileName); } @TestMetadata("unexpectedSymbol.kts") public void testUnexpectedSymbol() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/unexpectedSymbol.kts"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/unexpectedSymbol.kts"); doParsingTest(fileName); } } @@ -2560,74 +2560,74 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/secondaryConstructors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SecondaryConstructors extends AbstractJetParsingTest { + public static class SecondaryConstructors extends AbstractParsingTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/secondaryConstructors"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/secondaryConstructors"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("anonymousInitializer.kt") public void testAnonymousInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/anonymousInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/anonymousInitializer.kt"); doParsingTest(fileName); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/basic.kt"); doParsingTest(fileName); } @TestMetadata("emptyBody.kt") public void testEmptyBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/emptyBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/emptyBody.kt"); doParsingTest(fileName); } @TestMetadata("enumParsing.kt") public void testEnumParsing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/enumParsing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/enumParsing.kt"); doParsingTest(fileName); } @TestMetadata("recoveryEmptyDelegationType.kt") public void testRecoveryEmptyDelegationType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryEmptyDelegationType.kt"); doParsingTest(fileName); } @TestMetadata("recoveryJustConstructorKeyword.kt") public void testRecoveryJustConstructorKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeyword.kt"); doParsingTest(fileName); } @TestMetadata("recoveryJustConstructorKeywordSameLineBrace.kt") public void testRecoveryJustConstructorKeywordSameLineBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryJustConstructorKeywordSameLineBrace.kt"); doParsingTest(fileName); } @TestMetadata("recoveryNoDelegationCallAfterColon.kt") public void testRecoveryNoDelegationCallAfterColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryNoDelegationCallAfterColon.kt"); doParsingTest(fileName); } @TestMetadata("recoveryWithoutBodyWrongDelegationName.kt") public void testRecoveryWithoutBodyWrongDelegationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWithoutBodyWrongDelegationName.kt"); doParsingTest(fileName); } @TestMetadata("recoveryWithoutParameterList.kt") public void testRecoveryWithoutParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWithoutParameterList.kt"); doParsingTest(fileName); } @TestMetadata("recoveryWrongDelegationName.kt") public void testRecoveryWrongDelegationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/secondaryConstructors/recoveryWrongDelegationName.kt"); doParsingTest(fileName); } } @@ -2635,14 +2635,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/stringTemplates") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class StringTemplates extends AbstractJetParsingTest { + public static class StringTemplates extends AbstractParsingTest { public void testAllFilesPresentInStringTemplates() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/stringTemplates"), Pattern.compile("^(.*)\\.kts?$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/stringTemplates"), Pattern.compile("^(.*)\\.kts?$"), true); } @TestMetadata("RawStringsWithManyQuotes.kt") public void testRawStringsWithManyQuotes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt"); doParsingTest(fileName); } } @@ -2651,20 +2651,20 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/parseCodeFragment/expression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Expression extends AbstractJetParsingTest { + public static class Expression extends AbstractParsingTest { public void testAllFilesPresentInExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/expression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/expression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("error.kt") public void testError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/error.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/error.kt"); doExpressionCodeFragmentParsingTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/simple.kt"); doExpressionCodeFragmentParsingTest(fileName); } } @@ -2672,68 +2672,68 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/parseCodeFragment/block") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Block extends AbstractJetParsingTest { + public static class Block extends AbstractParsingTest { public void testAllFilesPresentInBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/block"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/block"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("expressionOnTopLevel.kt") public void testExpressionOnTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/expressionOnTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/expressionOnTopLevel.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/imports.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/localFun.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("oneLine.kt") public void testOneLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneLine.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("oneStatement.kt") public void testOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneStatement.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("packageAndImport.kt") public void testPackageAndImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageAndImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageAndImport.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("packageDirective.kt") public void testPackageDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageDirective.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("severalExpressions.kt") public void testSeveralExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalExpressions.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("severalStatements.kt") public void testSeveralStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalStatements.kt"); doBlockCodeFragmentParsingTest(fileName); } @TestMetadata("unexpectedSymbol.kt") public void testUnexpectedSymbol() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/unexpectedSymbol.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/unexpectedSymbol.kt"); doBlockCodeFragmentParsingTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index cd2d4c32768..a55a3d45dc0 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.ArrayList @@ -147,7 +147,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n") val document = DocumentImpl(psiFile.getText()) - UsefulTestCase.assertSameLines(JetTestUtils.getLastCommentedLines(document), renderedDescriptors.toString()) + UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString()) } override fun createEnvironment(): KotlinCoreEnvironment { diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt index 9d525996d84..1adb536a731 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.addIfNotNull import java.io.File @@ -61,7 +61,7 @@ abstract public class AbstractFunctionDescriptorInExpressionRendererTest : Kotli val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n") val document = DocumentImpl(file.getText()) - UsefulTestCase.assertSameLines(JetTestUtils.getLastCommentedLines(document), renderedDescriptors.toString()) + UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString()) } override fun createEnvironment(): KotlinCoreEnvironment { diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java index 7ca6b57382f..2cf4236ec08 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.renderer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DescriptorRendererTestGenerated extends AbstractDescriptorRendererTest { public void testAllFilesPresentInRenderer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Classes.kt") public void testClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt"); doTest(fileName); } @TestMetadata("Enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt"); doTest(fileName); } @TestMetadata("ErrorType.kt") public void testErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt"); doTest(fileName); } @TestMetadata("FunctionTypes.kt") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt"); doTest(fileName); } @TestMetadata("FunctionTypesInSignature.kt") public void testFunctionTypesInSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypesInSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypesInSignature.kt"); doTest(fileName); } @TestMetadata("GlobalFunctions.kt") public void testGlobalFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt"); doTest(fileName); } @TestMetadata("GlobalProperties.kt") public void testGlobalProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt"); doTest(fileName); } @TestMetadata("InheritedMembersVisibility.kt") public void testInheritedMembersVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt"); doTest(fileName); } @TestMetadata("KeywordsInNames.kt") public void testKeywordsInNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt"); doTest(fileName); } @TestMetadata("ObjectWithConstructor.kt") public void testObjectWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ObjectWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/ObjectWithConstructor.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/StarProjection.kt"); doTest(fileName); } @TestMetadata("TraitWithConstructor.kt") public void testTraitWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/TraitWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/TraitWithConstructor.kt"); doTest(fileName); } @TestMetadata("UnitType.kt") public void testUnitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/FunctionDescriptorInExpressionRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/FunctionDescriptorInExpressionRendererTestGenerated.java index 169d23b04c5..1a273b4f059 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/FunctionDescriptorInExpressionRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/renderer/FunctionDescriptorInExpressionRendererTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.renderer; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,42 +32,42 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class FunctionDescriptorInExpressionRendererTestGenerated extends AbstractFunctionDescriptorInExpressionRendererTest { public void testAllFilesPresentInRenderFunctionDescriptorInExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderFunctionDescriptorInExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderFunctionDescriptorInExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basicFunExpr.kt") public void testBasicFunExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExpr.kt"); doTest(fileName); } @TestMetadata("basicFunExprArgs.kt") public void testBasicFunExprArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExprArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExprArgs.kt"); doTest(fileName); } @TestMetadata("basicLambda.kt") public void testBasicLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicLambda.kt"); doTest(fileName); } @TestMetadata("labeledLambda.kt") public void testLabeledLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/labeledLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/labeledLambda.kt"); doTest(fileName); } @TestMetadata("parenthesizedFunExpr.kt") public void testParenthesizedFunExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedFunExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedFunExpr.kt"); doTest(fileName); } @TestMetadata("parenthesizedLambda.kt") public void testParenthesizedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedLambda.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt index 6df0844b9b8..4b95047c9d6 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.cli.jvm.repl.ReplInterpreter import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import org.junit.Assert import java.io.File @@ -81,7 +81,7 @@ public abstract class AbstractReplInterpreterTest : UsefulTestCase() { } protected fun doTest(path: String) { - val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) + val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) val repl = ReplInterpreter(getTestRootDisposable()!!, configuration, false, null) for ((code, expected) in loadLines(File(path))) { diff --git a/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java index 3f6169d0c48..cc1160ecbea 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.repl; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { public void testAllFilesPresentInRepl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("analyzeErrors.repl") public void testAnalyzeErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/analyzeErrors.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/analyzeErrors.repl"); doTest(fileName); } @TestMetadata("constants.repl") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/constants.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/constants.repl"); doTest(fileName); } @TestMetadata("empty.repl") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/empty.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/empty.repl"); doTest(fileName); } @TestMetadata("evaluationErrors.repl") public void testEvaluationErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/evaluationErrors.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/evaluationErrors.repl"); doTest(fileName); } @TestMetadata("function.repl") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/function.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/function.repl"); doTest(fileName); } @TestMetadata("functionOverloadResolution.repl") public void testFunctionOverloadResolution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolution.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolution.repl"); doTest(fileName); } @TestMetadata("functionOverloadResolutionAnyBeatsString.repl") public void testFunctionOverloadResolutionAnyBeatsString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl"); doTest(fileName); } @TestMetadata("functionReferencesPrev.repl") public void testFunctionReferencesPrev() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionReferencesPrev.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/functionReferencesPrev.repl"); doTest(fileName); } @TestMetadata("imports.repl") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/imports.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/imports.repl"); doTest(fileName); } @TestMetadata("simple.repl") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/simple.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/simple.repl"); doTest(fileName); } @TestMetadata("simpleTwoVals.repl") public void testSimpleTwoVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/simpleTwoVals.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/simpleTwoVals.repl"); doTest(fileName); } @TestMetadata("syntaxErrors.repl") public void testSyntaxErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/syntaxErrors.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/syntaxErrors.repl"); doTest(fileName); } @TestMetadata("twoClosures.repl") public void testTwoClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/twoClosures.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/twoClosures.repl"); doTest(fileName); } @@ -118,60 +118,60 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractReplInterpreterTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/classes"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/classes"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("classInheritance.repl") public void testClassInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classInheritance.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/classInheritance.repl"); doTest(fileName); } @TestMetadata("classRedeclaration.repl") public void testClassRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classRedeclaration.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/classRedeclaration.repl"); doTest(fileName); } @TestMetadata("emptyClass.repl") public void testEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClass.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClass.repl"); doTest(fileName); } @TestMetadata("emptyClassRedeclaration.repl") public void testEmptyClassRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClassRedeclaration.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClassRedeclaration.repl"); doTest(fileName); } @TestMetadata("enumEntrySubclass.repl") public void testEnumEntrySubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/enumEntrySubclass.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/enumEntrySubclass.repl"); doTest(fileName); } @TestMetadata("import.repl") public void testImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/import.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/import.repl"); doTest(fileName); } @TestMetadata("simpleClass.repl") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleClass.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleClass.repl"); doTest(fileName); } @TestMetadata("simpleEnum.repl") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleEnum.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleEnum.repl"); doTest(fileName); } @TestMetadata("simpleTrait.repl") public void testSimpleTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleTrait.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleTrait.repl"); doTest(fileName); } } @@ -181,30 +181,30 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class Multiline extends AbstractReplInterpreterTest { public void testAllFilesPresentInMultiline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/multiline"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/multiline"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("functionOnSeveralLines.repl") public void testFunctionOnSeveralLines() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/functionOnSeveralLines.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/multiline/functionOnSeveralLines.repl"); doTest(fileName); } @TestMetadata("multilineFunctionInvocation.repl") public void testMultilineFunctionInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/multilineFunctionInvocation.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/multiline/multilineFunctionInvocation.repl"); doTest(fileName); } @TestMetadata("openParenthesisIncomplete.repl") public void testOpenParenthesisIncomplete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/openParenthesisIncomplete.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/multiline/openParenthesisIncomplete.repl"); doTest(fileName); } @TestMetadata("simpleFunctionBodyOnNextLine.repl") public void testSimpleFunctionBodyOnNextLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl"); doTest(fileName); } } @@ -214,24 +214,24 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class Objects extends AbstractReplInterpreterTest { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/objects"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/objects"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("emptyObject.repl") public void testEmptyObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/emptyObject.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/objects/emptyObject.repl"); doTest(fileName); } @TestMetadata("localObject.repl") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/localObject.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/objects/localObject.repl"); doTest(fileName); } @TestMetadata("simpleObjectDeclaration.repl") public void testSimpleObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/simpleObjectDeclaration.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/objects/simpleObjectDeclaration.repl"); doTest(fileName); } } @@ -241,18 +241,18 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class PrimitiveTypes extends AbstractReplInterpreterTest { public void testAllFilesPresentInPrimitiveTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/primitiveTypes"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/primitiveTypes"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("arrayOfBoxed.repl") public void testArrayOfBoxed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl"); doTest(fileName); } @TestMetadata("boxingOnPurpose.repl") public void testBoxingOnPurpose() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl"); doTest(fileName); } } @@ -262,12 +262,12 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class Regressions extends AbstractReplInterpreterTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/regressions"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/regressions"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("kt6843.repl") public void testKt6843() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/regressions/kt6843.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/regressions/kt6843.repl"); doTest(fileName); } } @@ -277,12 +277,12 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @RunWith(JUnit3RunnerWithInners.class) public static class UseJava extends AbstractReplInterpreterTest { public void testAllFilesPresentInUseJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/useJava"), Pattern.compile("^(.+)\\.repl$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/useJava"), Pattern.compile("^(.+)\\.repl$"), true); } @TestMetadata("syntheticProperty.repl") public void testSyntheticProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/useJava/syntheticProperty.repl"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/repl/useJava/syntheticProperty.repl"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java index ddb3a4d567a..f3a58f9f011 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java @@ -26,8 +26,8 @@ public abstract class AbstractResolveTest extends ExtensibleResolveTestCase { Project project = getProject(); return new ExpectedResolveData( - JetExpectedResolveDataUtil.prepareDefaultNameToDescriptors(project, getEnvironment()), - JetExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project, getEnvironment()) + ExpectedResolveDataUtil.prepareDefaultNameToDescriptors(project, getEnvironment()), + ExpectedResolveDataUtil.prepareDefaultNameToDeclaration(project, getEnvironment()) ) { @Override protected KtFile createJetFile(String fileName, String text) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index f2c8131b7b7..7af35f98de2 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -21,14 +21,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinLiteFixture; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.List; import java.util.Map; -public abstract class ExtensibleResolveTestCase extends JetLiteFixture { +public abstract class ExtensibleResolveTestCase extends KotlinLiteFixture { private ExpectedResolveData expectedResolveData; @Override @@ -52,8 +52,8 @@ public abstract class ExtensibleResolveTestCase extends JetLiteFixture { protected void doTest(@NonNls String filePath) throws Exception { File file = new File(filePath); - String text = JetTestUtils.doLoadFile(file); - List files = JetTestUtils.createTestFiles("file.kt", text, new JetTestUtils.TestFileFactoryNoModules() { + String text = KotlinTestUtils.doLoadFile(file); + List files = KotlinTestUtils.createTestFiles("file.kt", text, new KotlinTestUtils.TestFileFactoryNoModules() { @NotNull @Override public KtFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java index 53747ee2f25..a8954e41c97 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,174 +32,174 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ResolveTestGenerated extends AbstractResolveTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("Basic.resolve") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Basic.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Basic.resolve"); doTest(fileName); } @TestMetadata("ClassObjects.resolve") public void testClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ClassObjects.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ClassObjects.resolve"); doTest(fileName); } @TestMetadata("Classifiers.resolve") public void testClassifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Classifiers.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Classifiers.resolve"); doTest(fileName); } @TestMetadata("DefaultParamsOfLocalFunctions.resolve") public void testDefaultParamsOfLocalFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve"); doTest(fileName); } @TestMetadata("ErrorSupertype.resolve") public void testErrorSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ErrorSupertype.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ErrorSupertype.resolve"); doTest(fileName); } @TestMetadata("ExtensionFunctions.resolve") public void testExtensionFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ExtensionFunctions.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ExtensionFunctions.resolve"); doTest(fileName); } @TestMetadata("FunctionVariable.resolve") public void testFunctionVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/FunctionVariable.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/FunctionVariable.resolve"); doTest(fileName); } @TestMetadata("ImportFromRootScope.resolve") public void testImportFromRootScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ImportFromRootScope.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ImportFromRootScope.resolve"); doTest(fileName); } @TestMetadata("ImportingRootScopeWhenProcessingImports.resolve") public void testImportingRootScopeWhenProcessingImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve"); doTest(fileName); } @TestMetadata("kt304.resolve") public void testKt304() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/kt304.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/kt304.resolve"); doTest(fileName); } @TestMetadata("LocalObjects.resolve") public void testLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/LocalObjects.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/LocalObjects.resolve"); doTest(fileName); } @TestMetadata("NestedObjects.resolve") public void testNestedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NestedObjects.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/NestedObjects.resolve"); doTest(fileName); } @TestMetadata("NoReferenceForErrorAnnotation.resolve") public void testNoReferenceForErrorAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve"); doTest(fileName); } @TestMetadata("Objects.resolve") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Objects.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Objects.resolve"); doTest(fileName); } @TestMetadata("Packages.resolve") public void testPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Packages.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Packages.resolve"); doTest(fileName); } @TestMetadata("PrimaryConstructorParameters.resolve") public void testPrimaryConstructorParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructorParameters.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructorParameters.resolve"); doTest(fileName); } @TestMetadata("PrimaryConstructors.resolve") public void testPrimaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructors.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructors.resolve"); doTest(fileName); } @TestMetadata("Projections.resolve") public void testProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Projections.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Projections.resolve"); doTest(fileName); } @TestMetadata("PropertyAndFunctionNameClash.resolve") public void testPropertyAndFunctionNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve"); doTest(fileName); } @TestMetadata("ResolveOfInfixExpressions.resolve") public void testResolveOfInfixExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveOfInfixExpressions.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ResolveOfInfixExpressions.resolve"); doTest(fileName); } @TestMetadata("ResolveToJava.resolve") public void testResolveToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava.resolve"); doTest(fileName); } @TestMetadata("ResolveToJava2.resolve") public void testResolveToJava2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava2.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava2.resolve"); doTest(fileName); } @TestMetadata("ResolveToJava3.resolve") public void testResolveToJava3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava3.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava3.resolve"); doTest(fileName); } @TestMetadata("ResolveToJavaTypeTransform.resolve") public void testResolveToJavaTypeTransform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve"); doTest(fileName); } @TestMetadata("ScopeInteraction.resolve") public void testScopeInteraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ScopeInteraction.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/ScopeInteraction.resolve"); doTest(fileName); } @TestMetadata("StringTemplates.resolve") public void testStringTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/StringTemplates.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/StringTemplates.resolve"); doTest(fileName); } @TestMetadata("Super.resolve") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Super.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/Super.resolve"); doTest(fileName); } @TestMetadata("TryCatch.resolve") public void testTryCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/TryCatch.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/TryCatch.resolve"); doTest(fileName); } @@ -208,108 +208,108 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class CandidatesPriority extends AbstractResolveTest { public void testAllFilesPresentInCandidatesPriority() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/candidatesPriority"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/candidatesPriority"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("classObjectOuterResolve.resolve") public void testClassObjectOuterResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve"); doTest(fileName); } @TestMetadata("closerReceiver1.resolve") public void testCloserReceiver1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve"); doTest(fileName); } @TestMetadata("closerReceiver2.resolve") public void testCloserReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve"); doTest(fileName); } @TestMetadata("closerReceiver3.resolve") public void testCloserReceiver3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve"); doTest(fileName); } @TestMetadata("closerScope.resolve") public void testCloserScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerScope.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerScope.resolve"); doTest(fileName); } @TestMetadata("dispatchReceiverVsExtensionReceiver.resolve") public void testDispatchReceiverVsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver.resolve"); doTest(fileName); } @TestMetadata("dispatchReceiverVsExtensionReceiver2.resolve") public void testDispatchReceiverVsExtensionReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver2.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/dispatchReceiverVsExtensionReceiver2.resolve"); doTest(fileName); } @TestMetadata("extensionToCloserReceiverVsMember.resolve") public void testExtensionToCloserReceiverVsMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve"); doTest(fileName); } @TestMetadata("implicitThisVsNoReceiver.resolve") public void testImplicitThisVsNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve"); doTest(fileName); } @TestMetadata("implicitThisVsNoReceiver2.resolve") public void testImplicitThisVsNoReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve"); doTest(fileName); } @TestMetadata("localVsImplicitThis.resolve") public void testLocalVsImplicitThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve"); doTest(fileName); } @TestMetadata("memberVsExtension1.resolve") public void testMemberVsExtension1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve"); doTest(fileName); } @TestMetadata("memberVsExtension2.resolve") public void testMemberVsExtension2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve"); doTest(fileName); } @TestMetadata("memberVsExtension3.resolve") public void testMemberVsExtension3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve"); doTest(fileName); } @TestMetadata("memberVsLocalExtension.resolve") public void testMemberVsLocalExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve"); doTest(fileName); } @TestMetadata("memberWithInvokeVsNonLocal.resolve") public void testMemberWithInvokeVsNonLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve"); doTest(fileName); } @TestMetadata("wrongReceiverVsOtherError.resolve") public void testWrongReceiverVsOtherError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve"); doTest(fileName); } } @@ -319,48 +319,48 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractResolveTest { public void testAllFilesPresentInDelegatedProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/delegatedProperty"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/delegatedProperty"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("delegationByCall.resolve") public void testDelegationByCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve"); doTest(fileName); } @TestMetadata("delegationByConstructor.resolve") public void testDelegationByConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve"); doTest(fileName); } @TestMetadata("delegationByFun.resolve") public void testDelegationByFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve"); doTest(fileName); } @TestMetadata("delegationByObject.resolve") public void testDelegationByObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve"); doTest(fileName); } @TestMetadata("delegationByProperty.resolve") public void testDelegationByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve"); doTest(fileName); } @TestMetadata("delegationInClass.resolve") public void testDelegationInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve"); doTest(fileName); } @TestMetadata("localDelegation.resolve") public void testLocalDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/localDelegation.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/localDelegation.resolve"); doTest(fileName); } } @@ -370,78 +370,78 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class Imports extends AbstractResolveTest { public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("ImportConflictAllPackage.resolve") public void testImportConflictAllPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve"); doTest(fileName); } @TestMetadata("ImportConflictBetweenImportedAndRootPackage.resolve") public void testImportConflictBetweenImportedAndRootPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve"); doTest(fileName); } @TestMetadata("ImportConflictBetweenImportedAndSamePackage.resolve") public void testImportConflictBetweenImportedAndSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve"); doTest(fileName); } @TestMetadata("ImportConflictForFunctions.resolve") public void testImportConflictForFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve"); doTest(fileName); } @TestMetadata("ImportConflictPackageAndClass.resolve") public void testImportConflictPackageAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve"); doTest(fileName); } @TestMetadata("ImportConflictSameNameClass.resolve") public void testImportConflictSameNameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve"); doTest(fileName); } @TestMetadata("ImportConflictWithClassObject.resolve") public void testImportConflictWithClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve"); doTest(fileName); } @TestMetadata("ImportConflictWithInFileClass.resolve") public void testImportConflictWithInFileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve"); doTest(fileName); } @TestMetadata("ImportConflictWithInnerClass.resolve") public void testImportConflictWithInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve"); doTest(fileName); } @TestMetadata("ImportConflictsWithMappedToJava.resolve") public void testImportConflictsWithMappedToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve"); doTest(fileName); } @TestMetadata("ImportNonBlockingAnalysis.resolve") public void testImportNonBlockingAnalysis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve"); doTest(fileName); } @TestMetadata("ImportResolveOrderStable.resolve") public void testImportResolveOrderStable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve"); doTest(fileName); } } @@ -451,18 +451,18 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class Labels extends AbstractResolveTest { public void testAllFilesPresentInLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/labels"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/labels"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("labelForPropertyInGetter.resolve") public void testLabelForPropertyInGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve"); doTest(fileName); } @TestMetadata("labelForPropertyInSetter.resolve") public void testLabelForPropertyInSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve"); doTest(fileName); } } @@ -472,18 +472,18 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class Regressions extends AbstractResolveTest { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/regressions"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/regressions"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("kt300.resolve") public void testKt300() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/regressions/kt300.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/regressions/kt300.resolve"); doTest(fileName); } @TestMetadata("objectInsideFun.resolve") public void testObjectInsideFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/regressions/objectInsideFun.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/regressions/objectInsideFun.resolve"); doTest(fileName); } } @@ -493,24 +493,24 @@ public class ResolveTestGenerated extends AbstractResolveTest { @RunWith(JUnit3RunnerWithInners.class) public static class Varargs extends AbstractResolveTest { public void testAllFilesPresentInVarargs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/varargs"), Pattern.compile("^(.+)\\.resolve$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/varargs"), Pattern.compile("^(.+)\\.resolve$"), true); } @TestMetadata("MoreSpecificVarargsOfEqualLength.resolve") public void testMoreSpecificVarargsOfEqualLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve"); doTest(fileName); } @TestMetadata("NilaryVsVararg.resolve") public void testNilaryVsVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/NilaryVsVararg.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/varargs/NilaryVsVararg.resolve"); doTest(fileName); } @TestMetadata("UnaryVsVararg.resolve") public void testUnaryVsVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/UnaryVsVararg.resolve"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolve/varargs/UnaryVsVararg.resolve"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 8dc1695a722..7cc859a9724 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererOptions; import org.jetbrains.kotlin.renderer.NameShortness; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.scopes.KtScope; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinLiteFixture; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.types.TypeProjection; import java.io.File; @@ -54,7 +54,7 @@ import java.util.List; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject; -public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFixture { +public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLiteFixture { private static final DescriptorRenderer WITH_ANNOTATION_ARGUMENT_TYPES = DescriptorRenderer.Companion.withOptions( new Function1() { @Override @@ -75,7 +75,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix @Override protected KotlinCoreEnvironment createEnvironment() { - return JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable()); + return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable()); } protected void doTest(@NotNull String content, @NotNull String expectedAnnotation) { @@ -337,8 +337,8 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix @NotNull protected KtFile getFile(@NotNull String content) { - KtFile ktFile = JetTestUtils.createFile("dummy.kt", content, getProject()); - AnalysisResult analysisResult = JetTestUtils.analyzeFile(ktFile, getEnvironment()); + KtFile ktFile = KotlinTestUtils.createFile("dummy.kt", content, getProject()); + AnalysisResult analysisResult = KotlinTestUtils.analyzeFile(ktFile, getEnvironment()); context = analysisResult.getBindingContext(); return ktFile; @@ -358,7 +358,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends JetLiteFix protected static String getContent(@NotNull String annotationText) throws IOException { File file = new File(PATH); - return JetTestUtils.doLoadFile(file).replaceAll("ANNOTATION", annotationText); + return KotlinTestUtils.doLoadFile(file).replaceAll("ANNOTATION", annotationText); } private static String renderAnnotations(Annotations annotations, @Nullable final AnnotationUseSiteTarget defaultTarget) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt index 8a7de52ce25..56bc3661098 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.annotation import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils public abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescriptorResolveTest() { fun doTest(path: String) { @@ -30,6 +30,6 @@ public abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescri val expected = InTextDirectivesUtils.findListWithPrefixes(fileText, "// EXPECTED: ").joinToString(", ") val actual = AbstractAnnotationDescriptorResolveTest.getAnnotations(classDescriptor) - JetTestUtils.assertEqualsToFile(File(path), fileText.replace(expected, actual)) + KotlinTestUtils.assertEqualsToFile(File(path), fileText.replace(expected, actual)) } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java index b04da71be85..db50ee7edf8 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.annotation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("byte.kt") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/byte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/byte.kt"); doTest(fileName); } @TestMetadata("char.kt") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/char.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/char.kt"); doTest(fileName); } @TestMetadata("double.kt") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/double.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/double.kt"); doTest(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/float.kt"); doTest(fileName); } @TestMetadata("int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/int.kt"); doTest(fileName); } @TestMetadata("long.kt") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/long.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/long.kt"); doTest(fileName); } @TestMetadata("short.kt") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/short.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/short.kt"); doTest(fileName); } @@ -82,216 +82,216 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractAnnotationParameterTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("andAnd.kt") public void testAndAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt"); doTest(fileName); } @TestMetadata("boolean.kt") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt"); doTest(fileName); } @TestMetadata("char.kt") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/char.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/char.kt"); doTest(fileName); } @TestMetadata("compositeCallBinary.kt") public void testCompositeCallBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt"); doTest(fileName); } @TestMetadata("divide.kt") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt"); doTest(fileName); } @TestMetadata("double.kt") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/double.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/double.kt"); doTest(fileName); } @TestMetadata("eqeq.kt") public void testEqeq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt"); doTest(fileName); } @TestMetadata("escapedString.kt") public void testEscapedString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt"); doTest(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/float.kt"); doTest(fileName); } @TestMetadata("gt.kt") public void testGt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt"); doTest(fileName); } @TestMetadata("gteq.kt") public void testGteq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt"); doTest(fileName); } @TestMetadata("infixCallBinary.kt") public void testInfixCallBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt"); doTest(fileName); } @TestMetadata("intrincics.kt") public void testIntrincics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt"); doTest(fileName); } @TestMetadata("labeled.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt"); doTest(fileName); } @TestMetadata("long.kt") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/long.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/long.kt"); doTest(fileName); } @TestMetadata("lt.kt") public void testLt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt"); doTest(fileName); } @TestMetadata("lteq.kt") public void testLteq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt"); doTest(fileName); } @TestMetadata("maxValue.kt") public void testMaxValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt"); doTest(fileName); } @TestMetadata("maxValueByte.kt") public void testMaxValueByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt"); doTest(fileName); } @TestMetadata("maxValueInt.kt") public void testMaxValueInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt"); doTest(fileName); } @TestMetadata("miltiply.kt") public void testMiltiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt"); doTest(fileName); } @TestMetadata("minus.kt") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt"); doTest(fileName); } @TestMetadata("mod.kt") public void testMod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt"); doTest(fileName); } @TestMetadata("multilineString.kt") public void testMultilineString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt"); doTest(fileName); } @TestMetadata("not.kt") public void testNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/not.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/not.kt"); doTest(fileName); } @TestMetadata("noteq.kt") public void testNoteq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt"); doTest(fileName); } @TestMetadata("orOr.kt") public void testOrOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt"); doTest(fileName); } @TestMetadata("paranthesized.kt") public void testParanthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt"); doTest(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt"); doTest(fileName); } @TestMetadata("simpleCallBinary.kt") public void testSimpleCallBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt"); doTest(fileName); } @TestMetadata("stringPlusInt.kt") public void testStringPlusInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt"); doTest(fileName); } @TestMetadata("strings.kt") public void testStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt"); doTest(fileName); } @TestMetadata("unaryMinus.kt") public void testUnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt"); doTest(fileName); } @TestMetadata("unaryPlus.kt") public void testUnaryPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt index 6f5dca91d08..f91b45039ca 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.resolve.calls import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetLiteFixture -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinLiteFixture +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver @@ -44,11 +44,11 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.KtFile import com.intellij.psi.PsiElement -public abstract class AbstractResolvedCallsTest : JetLiteFixture() { +public abstract class AbstractResolvedCallsTest : KotlinLiteFixture() { override fun createEnvironment(): KotlinCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL) public fun doTest(filePath: String) { - val text = JetTestUtils.doLoadFile(File(filePath))!! + val text = KotlinTestUtils.doLoadFile(File(filePath))!! val jetFile = KtPsiFactory(getProject()).createFile(text.replace("", "")) val bindingContext = JvmResolveUtil.analyzeOneFileWithJavaIntegration(jetFile, environment).bindingContext @@ -60,7 +60,7 @@ public abstract class AbstractResolvedCallsTest : JetLiteFixture() { else cachedCall.variableCall val resolvedCallInfoFileName = FileUtil.getNameWithoutExtension(filePath) + ".txt" - JetTestUtils.assertEqualsToFile(File(resolvedCallInfoFileName), "$text\n\n\n${resolvedCall?.renderToText()}") + KotlinTestUtils.assertEqualsToFile(File(resolvedCallInfoFileName), "$text\n\n\n${resolvedCall?.renderToText()}") } open protected fun buildCachedCall( diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java index 375b9314147..67c2f3be4dd 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,54 +32,54 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { public void testAllFilesPresentInResolvedCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("explicitReceiverIsDispatchReceiver.kt") public void testExplicitReceiverIsDispatchReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.kt"); doTest(fileName); } @TestMetadata("explicitReceiverIsExtensionReceiver.kt") public void testExplicitReceiverIsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("hasBothDispatchAndExtensionReceivers.kt") public void testHasBothDispatchAndExtensionReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.kt"); doTest(fileName); } @TestMetadata("hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt") public void testHasBothDispatchAndExtensionReceiversWithoutExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("implicitReceiverIsDispatchReceiver.kt") public void testImplicitReceiverIsDispatchReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.kt"); doTest(fileName); } @TestMetadata("implicitReceiverIsExtensionReceiver.kt") public void testImplicitReceiverIsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("impliedThisNoExplicitReceiver.kt") public void testImpliedThisNoExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("simpleCall.kt") public void testSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/simpleCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/simpleCall.kt"); doTest(fileName); } @@ -88,7 +88,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Arguments extends AbstractResolvedCallsTest { public void testAllFilesPresentInArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals") @@ -96,42 +96,42 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractResolvedCallsTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("chainedLambdas.kt") public void testChainedLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt"); doTest(fileName); } @TestMetadata("notInferredLambdaReturnType.kt") public void testNotInferredLambdaReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt"); doTest(fileName); } @TestMetadata("notInferredLambdaType.kt") public void testNotInferredLambdaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt"); doTest(fileName); } @TestMetadata("simpleGenericLambda.kt") public void testSimpleGenericLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt"); doTest(fileName); } @TestMetadata("simpleLambda.kt") public void testSimpleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt"); doTest(fileName); } @TestMetadata("unmappedLambda.kt") public void testUnmappedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt"); doTest(fileName); } } @@ -141,30 +141,30 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class GenericCalls extends AbstractResolvedCallsTest { public void testAllFilesPresentInGenericCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/genericCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/genericCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inferredParameter.kt") public void testInferredParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt"); doTest(fileName); } @TestMetadata("simpleGeneric.kt") public void testSimpleGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt"); doTest(fileName); } @TestMetadata("uninferredParameter.kt") public void testUninferredParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt"); doTest(fileName); } @TestMetadata("uninferredParameterTypeMismatch.kt") public void testUninferredParameterTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt"); doTest(fileName); } } @@ -174,18 +174,18 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class NamedArguments extends AbstractResolvedCallsTest { public void testAllFilesPresentInNamedArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("positionedAfterNamed.kt") public void testPositionedAfterNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt"); doTest(fileName); } @TestMetadata("shiftedArgsMatch.kt") public void testShiftedArgsMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt"); doTest(fileName); } } @@ -195,30 +195,30 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class OneArgument extends AbstractResolvedCallsTest { public void testAllFilesPresentInOneArgument() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/oneArgument"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/oneArgument"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentHasNoType.kt") public void testArgumentHasNoType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt"); doTest(fileName); } @TestMetadata("simpleMatch.kt") public void testSimpleMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt"); doTest(fileName); } @TestMetadata("typeMismatch.kt") public void testTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt"); doTest(fileName); } @TestMetadata("unmappedArgument.kt") public void testUnmappedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt"); doTest(fileName); } } @@ -228,18 +228,18 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class RealExamples extends AbstractResolvedCallsTest { public void testAllFilesPresentInRealExamples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyList.kt") public void testEmptyList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt"); doTest(fileName); } @TestMetadata("emptyMutableList.kt") public void testEmptyMutableList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt"); doTest(fileName); } } @@ -249,12 +249,12 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class SeveralCandidates extends AbstractResolvedCallsTest { public void testAllFilesPresentInSeveralCandidates() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/severalCandidates"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/severalCandidates"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mostSpecific.kt") public void testMostSpecific() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt"); doTest(fileName); } } @@ -265,24 +265,24 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class DifferentCallElements extends AbstractResolvedCallsTest { public void testAllFilesPresentInDifferentCallElements() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/differentCallElements"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/differentCallElements"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationCall.kt") public void testAnnotationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt"); doTest(fileName); } @TestMetadata("delegatorToSuperCall.kt") public void testDelegatorToSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt"); doTest(fileName); } @TestMetadata("simpleArrayAccess.kt") public void testSimpleArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt"); doTest(fileName); } } @@ -292,42 +292,42 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Dynamic extends AbstractResolvedCallsTest { public void testAllFilesPresentInDynamic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/dynamic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/dynamic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("explicitReceiverIsDispatchReceiver.kt") public void testExplicitReceiverIsDispatchReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.kt"); doTest(fileName); } @TestMetadata("explicitReceiverIsExtensionReceiver.kt") public void testExplicitReceiverIsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("hasBothDispatchAndExtensionReceivers.kt") public void testHasBothDispatchAndExtensionReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.kt"); doTest(fileName); } @TestMetadata("hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt") public void testHasBothDispatchAndExtensionReceiversWithoutExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("implicitReceiverIsDispatchReceiver.kt") public void testImplicitReceiverIsDispatchReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.kt"); doTest(fileName); } @TestMetadata("implicitReceiverIsExtensionReceiver.kt") public void testImplicitReceiverIsExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.kt"); doTest(fileName); } } @@ -337,42 +337,42 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionTypes extends AbstractResolvedCallsTest { public void testAllFilesPresentInFunctionTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/functionTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/functionTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("invokeForExtensionFunctionType.kt") public void testInvokeForExtensionFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt"); doTest(fileName); } @TestMetadata("invokeForFunctionType.kt") public void testInvokeForFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt"); doTest(fileName); } @TestMetadata("valOfExtensionFunctionType.kt") public void testValOfExtensionFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt"); doTest(fileName); } @TestMetadata("valOfExtensionFunctionTypeInvoke.kt") public void testValOfExtensionFunctionTypeInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt"); doTest(fileName); } @TestMetadata("valOfFunctionType.kt") public void testValOfFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt"); doTest(fileName); } @TestMetadata("valOfFunctionTypeInvoke.kt") public void testValOfFunctionTypeInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt"); doTest(fileName); } } @@ -382,66 +382,66 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractResolvedCallsTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bothReceivers.kt") public void testBothReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/bothReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/bothReceivers.kt"); doTest(fileName); } @TestMetadata("dispatchReceiverAsReceiverForInvoke.kt") public void testDispatchReceiverAsReceiverForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.kt"); doTest(fileName); } @TestMetadata("extensionReceiverAsReceiverForInvoke.kt") public void testExtensionReceiverAsReceiverForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.kt"); doTest(fileName); } @TestMetadata("implicitReceiverForInvoke.kt") public void testImplicitReceiverForInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObject1.kt") public void testInvokeOnClassObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnClassObject2.kt") public void testInvokeOnClassObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt"); doTest(fileName); } @TestMetadata("invokeOnEnumEntry1.kt") public void testInvokeOnEnumEntry1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt"); doTest(fileName); } @TestMetadata("invokeOnEnumEntry2.kt") public void testInvokeOnEnumEntry2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt"); doTest(fileName); } @TestMetadata("invokeOnObject1.kt") public void testInvokeOnObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt"); doTest(fileName); } @TestMetadata("invokeOnObject2.kt") public void testInvokeOnObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt"); doTest(fileName); } } @@ -451,24 +451,24 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ObjectsAndClassObjects extends AbstractResolvedCallsTest { public void testAllFilesPresentInObjectsAndClassObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/objectsAndClassObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/objectsAndClassObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt"); doTest(fileName); } @TestMetadata("kt5308IntRangeConstant.kt") public void testKt5308IntRangeConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt"); doTest(fileName); } } @@ -478,12 +478,12 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class RealExamples extends AbstractResolvedCallsTest { public void testAllFilesPresentInRealExamples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("stringPlusInBuilders.kt") public void testStringPlusInBuilders() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt"); doTest(fileName); } } @@ -493,18 +493,18 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Resolve extends AbstractResolvedCallsTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/resolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mostSpecificUninferredParam.kt") public void testMostSpecificUninferredParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt"); doTest(fileName); } @TestMetadata("mostSpecificWithLambda.kt") public void testMostSpecificWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt"); doTest(fileName); } } @@ -514,90 +514,90 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractResolvedCallsTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithGenerics.kt") public void testClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.kt"); doTest(fileName); } @TestMetadata("classWithGenerics2.kt") public void testClassWithGenerics2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics2.kt"); doTest(fileName); } @TestMetadata("classWithGenerics3.kt") public void testClassWithGenerics3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.kt"); doTest(fileName); } @TestMetadata("explicitPrimaryArgs.kt") public void testExplicitPrimaryArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.kt"); doTest(fileName); } @TestMetadata("explicitPrimaryCallSecondary.kt") public void testExplicitPrimaryCallSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.kt"); doTest(fileName); } @TestMetadata("explicitPrimaryNoArgs.kt") public void testExplicitPrimaryNoArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.kt"); doTest(fileName); } @TestMetadata("implicitPrimary.kt") public void testImplicitPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.kt"); doTest(fileName); } @TestMetadata("overload1.kt") public void testOverload1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload1.kt"); doTest(fileName); } @TestMetadata("overload2.kt") public void testOverload2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload2.kt"); doTest(fileName); } @TestMetadata("overload3.kt") public void testOverload3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overload3.kt"); doTest(fileName); } @TestMetadata("overloadDefault.kt") public void testOverloadDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.kt"); doTest(fileName); } @TestMetadata("overloadNamed.kt") public void testOverloadNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/simple.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/secondaryConstructors/varargs.kt"); doTest(fileName); } } @@ -607,36 +607,36 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ThisOrSuper extends AbstractResolvedCallsTest { public void testAllFilesPresentInThisOrSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/thisOrSuper"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/thisOrSuper"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("labeledSuper.kt") public void testLabeledSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt"); doTest(fileName); } @TestMetadata("labeledThis.kt") public void testLabeledThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt"); doTest(fileName); } @TestMetadata("simpleSuper.kt") public void testSimpleSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt"); doTest(fileName); } @TestMetadata("simpleThis.kt") public void testSimpleThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt"); doTest(fileName); } @TestMetadata("thisInExtensionFunction.kt") public void testThisInExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java index b6f3d3a515a..f93a13d0d34 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,132 +32,132 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ResolvedConstructorDelegationCallsTestsGenerated extends AbstractResolvedConstructorDelegationCallsTests { public void testAllFilesPresentInResolveConstructorDelegationCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveConstructorDelegationCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveConstructorDelegationCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithGenerics.kt") public void testClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.kt"); doTest(fileName); } @TestMetadata("generics2.kt") public void testGenerics2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics2.kt"); doTest(fileName); } @TestMetadata("generics3.kt") public void testGenerics3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics3.kt"); doTest(fileName); } @TestMetadata("generics4.kt") public void testGenerics4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics4.kt"); doTest(fileName); } @TestMetadata("generics5.kt") public void testGenerics5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/generics5.kt"); doTest(fileName); } @TestMetadata("inheritanceWithGeneric.kt") public void testInheritanceWithGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.kt"); doTest(fileName); } @TestMetadata("innerClassDelegatingPrimary.kt") public void testInnerClassDelegatingPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.kt"); doTest(fileName); } @TestMetadata("innerClassDelegatingSecondary.kt") public void testInnerClassDelegatingSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.kt"); doTest(fileName); } @TestMetadata("superAnyEmpty.kt") public void testSuperAnyEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.kt"); doTest(fileName); } @TestMetadata("superAnyImplicit.kt") public void testSuperAnyImplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.kt"); doTest(fileName); } @TestMetadata("superPrimary.kt") public void testSuperPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimary.kt"); doTest(fileName); } @TestMetadata("superPrimaryEmpty.kt") public void testSuperPrimaryEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.kt"); doTest(fileName); } @TestMetadata("superPrimaryImplicit.kt") public void testSuperPrimaryImplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.kt"); doTest(fileName); } @TestMetadata("superSecondary.kt") public void testSuperSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondary.kt"); doTest(fileName); } @TestMetadata("superSecondaryImplicit.kt") public void testSuperSecondaryImplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.kt"); doTest(fileName); } @TestMetadata("superSecondaryOverload.kt") public void testSuperSecondaryOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.kt"); doTest(fileName); } @TestMetadata("thisPrimary.kt") public void testThisPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisPrimary.kt"); doTest(fileName); } @TestMetadata("thisPrimaryEmpty.kt") public void testThisPrimaryEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.kt"); doTest(fileName); } @TestMetadata("thisSecondary.kt") public void testThisSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisSecondary.kt"); doTest(fileName); } @TestMetadata("thisSecondaryOverload.kt") public void testThisSecondaryOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/resolveConstructorDelegationCalls/varargs.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt index 315a4001d11..8c641552907 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.regex.Pattern @@ -99,7 +99,7 @@ public abstract class AbstractCompileTimeConstantEvaluatorTest : AbstractAnnotat actualFileText = actualFileText.replace(expected, actual) } - JetTestUtils.assertEqualsToFile(myFile, actualFileText) + KotlinTestUtils.assertEqualsToFile(myFile, actualFileText) } fun getObjectsToTest(fileText: String): List { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java index 3954388e14e..df6f8f0db5e 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/CompileTimeConstantEvaluatorTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.constants.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,126 +34,126 @@ public class CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTi @RunWith(JUnit3RunnerWithInners.class) public static class Constant extends AbstractCompileTimeConstantEvaluatorTest { public void testAllFilesPresentInConstant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectProperty.kt") public void testClassObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/classObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/classObjectProperty.kt"); doConstantTest(fileName); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/compareTo.kt"); doConstantTest(fileName); } @TestMetadata("differentTypes.kt") public void testDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/differentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/differentTypes.kt"); doConstantTest(fileName); } @TestMetadata("divideByZero.kt") public void testDivideByZero() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/divideByZero.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/divideByZero.kt"); doConstantTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/equals.kt"); doConstantTest(fileName); } @TestMetadata("exceptionWhenEvaluate.kt") public void testExceptionWhenEvaluate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt"); doConstantTest(fileName); } @TestMetadata("finalProperty.kt") public void testFinalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/finalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/finalProperty.kt"); doConstantTest(fileName); } @TestMetadata("float.kt") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/float.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/float.kt"); doConstantTest(fileName); } @TestMetadata("floatsAndDoubles.kt") public void testFloatsAndDoubles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/floatsAndDoubles.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/floatsAndDoubles.kt"); doConstantTest(fileName); } @TestMetadata("integer.kt") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integer.kt"); doConstantTest(fileName); } @TestMetadata("integers.kt") public void testIntegers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integers.kt"); doConstantTest(fileName); } @TestMetadata("localVal.kt") public void testLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVal.kt"); doConstantTest(fileName); } @TestMetadata("localVar.kt") public void testLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVar.kt"); doConstantTest(fileName); } @TestMetadata("nonFinalProperty.kt") public void testNonFinalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/nonFinalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/nonFinalProperty.kt"); doConstantTest(fileName); } @TestMetadata("objectProperty.kt") public void testObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/objectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/objectProperty.kt"); doConstantTest(fileName); } @TestMetadata("strings.kt") public void testStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/strings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/strings.kt"); doConstantTest(fileName); } @TestMetadata("topLevelVal.kt") public void testTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVal.kt"); doConstantTest(fileName); } @TestMetadata("topLevelVar.kt") public void testTopLevelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVar.kt"); doConstantTest(fileName); } @TestMetadata("unaryMinusIndepWoExpType.kt") public void testUnaryMinusIndepWoExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt"); doConstantTest(fileName); } @TestMetadata("unaryMinusIndependentExpType.kt") public void testUnaryMinusIndependentExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt"); doConstantTest(fileName); } } @@ -163,36 +163,36 @@ public class CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTi @RunWith(JUnit3RunnerWithInners.class) public static class IsPure extends AbstractCompileTimeConstantEvaluatorTest { public void testAllFilesPresentInIsPure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerToType.kt") public void testInnerToType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/innerToType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/innerToType.kt"); doIsPureTest(fileName); } @TestMetadata("namedConstants.kt") public void testNamedConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/namedConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/namedConstants.kt"); doIsPureTest(fileName); } @TestMetadata("toType.kt") public void testToType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/toType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/toType.kt"); doIsPureTest(fileName); } @TestMetadata("unaryMinusIndepWoExpType.kt") public void testUnaryMinusIndepWoExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt"); doIsPureTest(fileName); } @TestMetadata("unaryMinusIndependentExpType.kt") public void testUnaryMinusIndependentExpType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt"); doIsPureTest(fileName); } } @@ -202,30 +202,30 @@ public class CompileTimeConstantEvaluatorTestGenerated extends AbstractCompileTi @RunWith(JUnit3RunnerWithInners.class) public static class UsesVariableAsConstant extends AbstractCompileTimeConstantEvaluatorTest { public void testAllFilesPresentInUsesVariableAsConstant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryTypes.kt") public void testBinaryTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt"); doUsesVariableAsConstantTest(fileName); } @TestMetadata("NamedConstants.kt") public void testNamedConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt"); doUsesVariableAsConstantTest(fileName); } @TestMetadata("OtherTypes.kt") public void testOtherTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt"); doUsesVariableAsConstantTest(fileName); } @TestMetadata("simpleTypes.kt") public void testSimpleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt"); doUsesVariableAsConstantTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt index 7b6b840c237..68a04e2f621 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.Constrain import org.jetbrains.kotlin.resolve.calls.inference.registerTypeVariables import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetLiteFixture -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinLiteFixture +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.tests.di.createContainerForTests import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.KotlinType @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.types.Variance import java.io.File import java.util.ArrayList -abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { +abstract public class AbstractConstraintSystemTest() : KotlinLiteFixture() { private var _typeResolver: TypeResolver? = null private val typeResolver: TypeResolver @@ -52,14 +52,14 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { override fun setUp() { super.setUp() - _typeResolver = createContainerForTests(getProject(), JetTestUtils.createEmptyModule()).typeResolver + _typeResolver = createContainerForTests(getProject(), KotlinTestUtils.createEmptyModule()).typeResolver _testDeclarations = analyzeDeclarations() } override fun tearDown() { _typeResolver = null _testDeclarations = null - super.tearDown() + super.tearDown() } override fun getTestDataPath(): String { @@ -113,7 +113,7 @@ abstract public class AbstractConstraintSystemTest() : JetLiteFixture() { }.join("\n", prefix = "result:\n") val boundsFile = File(filePath.replace("constraints", "bounds")) - JetTestUtils.assertEqualsToFile(boundsFile, "${constraintsFileText.join("\n")}\n\n$resultingStatus\n\n$result") + KotlinTestUtils.assertEqualsToFile(boundsFile, "${constraintsFileText.join("\n")}\n\n$resultingStatus\n\n$result") } class MyConstraint(val kind: MyConstraintKind, val firstType: String, val secondType: String) diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index ca0e0c624f0..17adb7ef131 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.resolve.scopes.KtScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinTypeImpl import java.util.regex.Pattern @@ -70,8 +70,8 @@ public class ConstraintSystemTestData( ) } return typeResolver.resolveType( - scopeToResolveTypeParameters, KtPsiFactory(project).createType(name), - JetTestUtils.DUMMY_TRACE, true) + scopeToResolveTypeParameters, KtPsiFactory(project).createType(name), + KotlinTestUtils.DUMMY_TRACE, true) } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java index 19e745ee98c..ad23d5ea289 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.constraintSystem; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest { public void testAllFilesPresentInConstraintSystem() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("compiler/testData/constraintSystem/checkStatus") @@ -40,30 +40,30 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class CheckStatus extends AbstractConstraintSystemTest { public void testAllFilesPresentInCheckStatus() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("conflictingConstraints.constraints") public void testConflictingConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.constraints"); doTest(fileName); } @TestMetadata("successful.constraints") public void testSuccessful() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/successful.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/successful.constraints"); doTest(fileName); } @TestMetadata("typeConstructorMismatch.constraints") public void testTypeConstructorMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.constraints"); doTest(fileName); } @TestMetadata("unknownParameters.constraints") public void testUnknownParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/unknownParameters.constraints"); doTest(fileName); } } @@ -73,30 +73,30 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class ComputeValues extends AbstractConstraintSystemTest { public void testAllFilesPresentInComputeValues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("contradiction.constraints") public void testContradiction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/contradiction.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/contradiction.constraints"); doTest(fileName); } @TestMetadata("subTypeOfUpperBounds.constraints") public void testSubTypeOfUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.constraints"); doTest(fileName); } @TestMetadata("superTypeOfLowerBounds1.constraints") public void testSuperTypeOfLowerBounds1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.constraints"); doTest(fileName); } @TestMetadata("superTypeOfLowerBounds2.constraints") public void testSuperTypeOfLowerBounds2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.constraints"); doTest(fileName); } } @@ -106,54 +106,54 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class IntegerValueTypes extends AbstractConstraintSystemTest { public void testAllFilesPresentInIntegerValueTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("byteOverflow.constraints") public void testByteOverflow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.constraints"); doTest(fileName); } @TestMetadata("defaultLong.constraints") public void testDefaultLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/defaultLong.constraints"); doTest(fileName); } @TestMetadata("numberAndAny.constraints") public void testNumberAndAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.constraints"); doTest(fileName); } @TestMetadata("numberAndString.constraints") public void testNumberAndString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndString.constraints"); doTest(fileName); } @TestMetadata("severalNumbers.constraints") public void testSeveralNumbers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.constraints"); doTest(fileName); } @TestMetadata("simpleByte.constraints") public void testSimpleByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleByte.constraints"); doTest(fileName); } @TestMetadata("simpleInt.constraints") public void testSimpleInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleInt.constraints"); doTest(fileName); } @TestMetadata("simpleShort.constraints") public void testSimpleShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleShort.constraints"); doTest(fileName); } } @@ -163,42 +163,42 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class SeveralVariables extends AbstractConstraintSystemTest { public void testAllFilesPresentInSeveralVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("simpleDependency.constraints") public void testSimpleDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleDependency.constraints"); doTest(fileName); } @TestMetadata("simpleEquality.constraints") public void testSimpleEquality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleEquality.constraints"); doTest(fileName); } @TestMetadata("simpleEquality1.constraints") public void testSimpleEquality1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleEquality1.constraints"); doTest(fileName); } @TestMetadata("simpleReversedDependency.constraints") public void testSimpleReversedDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleReversedDependency.constraints"); doTest(fileName); } @TestMetadata("simpleSubtype.constraints") public void testSimpleSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleSubtype.constraints"); doTest(fileName); } @TestMetadata("simpleSubtype1.constraints") public void testSimpleSubtype1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleSubtype1.constraints"); doTest(fileName); } @@ -207,7 +207,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Direct extends AbstractConstraintSystemTest { public void testAllFilesPresentInDirect() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant") @@ -215,60 +215,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Contravariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInContravariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/contravariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -278,60 +278,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Covariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInCovariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/covariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -341,60 +341,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Invariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInInvariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/direct/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/direct/invariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -405,24 +405,24 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Interdependency extends AbstractConstraintSystemTest { public void testAllFilesPresentInInterdependency() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/interdependency"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/interdependency"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("interdependency1.constraints") public void testInterdependency1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency1.constraints"); doTest(fileName); } @TestMetadata("interdependency2.constraints") public void testInterdependency2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency2.constraints"); doTest(fileName); } @TestMetadata("interdependency3.constraints") public void testInterdependency3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/interdependency/interdependency3.constraints"); doTest(fileName); } } @@ -432,7 +432,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Nullable extends AbstractConstraintSystemTest { public void testAllFilesPresentInNullable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant") @@ -440,60 +440,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Contravariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInContravariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/contravariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -503,60 +503,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Covariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInCovariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/covariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -566,60 +566,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Invariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInInvariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/nullable/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/nullable/invariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -630,78 +630,78 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Other extends AbstractConstraintSystemTest { public void testAllFilesPresentInOther() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/other"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/other"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("constraintForNullables.constraints") public void testConstraintForNullables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/constraintForNullables.constraints"); doTest(fileName); } @TestMetadata("nestedConsumer.constraints") public void testNestedConsumer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer.constraints"); doTest(fileName); } @TestMetadata("nestedConsumer1.constraints") public void testNestedConsumer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedConsumer1.constraints"); doTest(fileName); } @TestMetadata("nestedInvConsumer.constraints") public void testNestedInvConsumer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedInvConsumer.constraints"); doTest(fileName); } @TestMetadata("nestedInvProducer.constraints") public void testNestedInvProducer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedInvProducer.constraints"); doTest(fileName); } @TestMetadata("nestedProducer.constraints") public void testNestedProducer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedProducer.constraints"); doTest(fileName); } @TestMetadata("nestedProducerAndConsumer.constraints") public void testNestedProducerAndConsumer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/nestedProducerAndConsumer.constraints"); doTest(fileName); } @TestMetadata("severalOccurrences.constraints") public void testSeveralOccurrences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/severalOccurrences.constraints"); doTest(fileName); } @TestMetadata("simpleFun.constraints") public void testSimpleFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleFun.constraints"); doTest(fileName); } @TestMetadata("simpleThreeVars.constraints") public void testSimpleThreeVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVars.constraints"); doTest(fileName); } @TestMetadata("simpleThreeVarsNoIncorporation.constraints") public void testSimpleThreeVarsNoIncorporation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporation.constraints"); doTest(fileName); } @TestMetadata("simpleThreeVarsNoIncorporationFixed.constraints") public void testSimpleThreeVarsNoIncorporationFixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/other/simpleThreeVarsNoIncorporationFixed.constraints"); doTest(fileName); } } @@ -711,30 +711,30 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Recursive extends AbstractConstraintSystemTest { public void testAllFilesPresentInRecursive() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/recursive"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/recursive"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("implicitlyRecursive.constraints") public void testImplicitlyRecursive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/implicitlyRecursive.constraints"); doTest(fileName); } @TestMetadata("kt8879.constraints") public void testKt8879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/kt8879.constraints"); doTest(fileName); } @TestMetadata("mutuallyRecursive.constraints") public void testMutuallyRecursive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/mutuallyRecursive.constraints"); doTest(fileName); } @TestMetadata("simpleRecursive.constraints") public void testSimpleRecursive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/recursive/simpleRecursive.constraints"); doTest(fileName); } } @@ -744,7 +744,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Reversed extends AbstractConstraintSystemTest { public void testAllFilesPresentInReversed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant") @@ -752,60 +752,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Contravariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInContravariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/contravariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/contravariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -815,60 +815,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Covariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInCovariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/covariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/covariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -878,60 +878,60 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Invariant extends AbstractConstraintSystemTest { public void testAllFilesPresentInInvariant() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables/reversed/invariant"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("varEqDepEq.constraints") public void testVarEqDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepEq.constraints"); doTest(fileName); } @TestMetadata("varEqDepSub.constraints") public void testVarEqDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSub.constraints"); doTest(fileName); } @TestMetadata("varEqDepSuper.constraints") public void testVarEqDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varEqDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSubDepEq.constraints") public void testVarSubDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepEq.constraints"); doTest(fileName); } @TestMetadata("varSubDepSub.constraints") public void testVarSubDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSub.constraints"); doTest(fileName); } @TestMetadata("varSubDepSuper.constraints") public void testVarSubDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSubDepSuper.constraints"); doTest(fileName); } @TestMetadata("varSuperDepEq.constraints") public void testVarSuperDepEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepEq.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSub.constraints") public void testVarSuperDepSub() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSub.constraints"); doTest(fileName); } @TestMetadata("varSuperDepSuper.constraints") public void testVarSuperDepSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/reversed/invariant/varSuperDepSuper.constraints"); doTest(fileName); } } @@ -943,24 +943,24 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @RunWith(JUnit3RunnerWithInners.class) public static class Variance extends AbstractConstraintSystemTest { public void testAllFilesPresentInVariance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.constraints$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.constraints$"), true); } @TestMetadata("consumer.constraints") public void testConsumer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/consumer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/consumer.constraints"); doTest(fileName); } @TestMetadata("invariant.constraints") public void testInvariant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/invariant.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/invariant.constraints"); doTest(fileName); } @TestMetadata("producer.constraints") public void testProducer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/producer.constraints"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/producer.constraints"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 7323a09adbf..290ec111629 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.resolve.typeApproximation -import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.KotlinLiteFixture import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.test.ConfigurationKind import java.io.File @@ -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.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.calls.inference.createCapturedType import org.jetbrains.kotlin.diagnostics.Severity @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -public class CapturedTypeApproximationTest() : JetLiteFixture() { +public class CapturedTypeApproximationTest() : KotlinLiteFixture() { override fun getTestDataPath() = "compiler/testData/capturedTypeApproximation/" @@ -47,7 +47,7 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() { assert(substitutions.size() in 1..2) { "Captured type approximation test requires substitutions for (T) or (T, R)" } val oneTypeVariable = substitutions.size() == 1 - val declarationsText = JetTestUtils.doLoadFile(File(getTestDataPath() + "/declarations.kt")) + val declarationsText = KotlinTestUtils.doLoadFile(File(getTestDataPath() + "/declarations.kt")) fun analyzeTestFile(testType: String) = run { val test = declarationsText.replace("#TestType#", testType) @@ -124,7 +124,7 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() { } } - JetTestUtils.assertEqualsToFile(File(getTestDataPath() + "/" + filePath), result.toString()) + KotlinTestUtils.assertEqualsToFile(File(getTestDataPath() + "/" + filePath), result.toString()) } private fun getTypePatternsForOneTypeVariable() = listOf("In<#T#>", "Out<#T#>", "Inv<#T#>", "Inv", "Inv") diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 48045f8feae..c09112912fa 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; @@ -81,7 +81,7 @@ public class ScriptTest { Disposable rootDisposable = Disposer.newDisposable(); try { CompilerConfiguration configuration = - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector); ContentRootsKt.addKotlinSourceRoot(configuration, "compiler/testData/script/" + scriptPath); configuration.addAll(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, scriptDefinitions); diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 53f59d8be6a..30e0e693381 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -52,7 +52,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val environment = KotlinCoreEnvironment.createForTests( testRootDisposable, - JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), + KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), EnvironmentConfigFiles.JVM_CONFIG_FILES ) val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.getModuleName()) @@ -72,7 +72,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile( classDescriptor, RecursiveDescriptorComparator.DONT_INCLUDE_METHODS_OF_OBJECT, - JetTestUtils.replaceExtension(source, "txt") + KotlinTestUtils.replaceExtension(source, "txt") ) } diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java index 74531ae6329..1eb017ed61a 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LocalClassProtoTestGenerated extends AbstractLocalClassProtoTest { public void testAllFilesPresentInLocal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/serialization/local"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/serialization/local"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotationsInLocalClass.kt") public void testAnnotationsInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/annotationsInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/annotationsInLocalClass.kt"); doTest(fileName); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/anonymousObject.kt"); doTest(fileName); } @TestMetadata("deepInnerChain.kt") public void testDeepInnerChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/deepInnerChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/deepInnerChain.kt"); doTest(fileName); } @TestMetadata("innerOfLocal.kt") public void testInnerOfLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/innerOfLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/innerOfLocal.kt"); doTest(fileName); } @TestMetadata("localClassInSignature.kt") public void testLocalClassInSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/localClassInSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/localClassInSignature.kt"); doTest(fileName); } @TestMetadata("simpleInMemberFunction.kt") public void testSimpleInMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/simpleInMemberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/simpleInMemberFunction.kt"); doTest(fileName); } @TestMetadata("simpleInTopLevelFunction.kt") public void testSimpleInTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/serialization/local/simpleInTopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/serialization/local/simpleInTopLevelFunction.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt index 3831d417d58..304632a5469 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.serialization.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.storage.LockBasedStorageManager -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator import java.io.File @@ -39,7 +39,7 @@ public class BuiltInsSerializerTest : TestCaseWithTmpdir() { ) val platform = TargetPlatform.Default - val module = JetTestUtils.createEmptyModule("", platform) + val module = KotlinTestUtils.createEmptyModule("", platform) val packageFragmentProvider = createBuiltInPackageFragmentProvider( LockBasedStorageManager(), module, setOf(TEST_PACKAGE_FQNAME), ClassDescriptorFactory.EMPTY diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 8d7c632944b..05392a4e5cd 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.kotlin.serialization.deserialization.AdditionalSupertypes; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; @@ -82,7 +82,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment { PackageFragmentDescriptor deserialized = createBuiltInsPackageFragment(); - List files = JetTestUtils.loadToJetFiles(getEnvironment(), ContainerUtil.concat( + List files = KotlinTestUtils.loadToJetFiles(getEnvironment(), ContainerUtil.concat( allFilesUnder("core/builtins/native"), allFilesUnder("core/builtins/src") )); diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 22f8a2dbd73..669860ed4c3 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.storage.LockBasedStorageManager -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils @@ -78,7 +78,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { } private fun deserialize(metaFile: File): ModuleDescriptorImpl { - val module = JetTestUtils.createEmptyModule("<$MODULE_NAME>", JsPlatform) + val module = KotlinTestUtils.createEmptyModule("<$MODULE_NAME>", JsPlatform) val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile) assert(metadata.size() == 1) diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java index d96c4d6fe60..84613728f57 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java +++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java @@ -48,7 +48,7 @@ public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment { } protected String getTestDataPath() { - return JetTestUtils.getTestDataPathBase(); + return KotlinTestUtils.getTestDataPathBase(); } @Override @@ -63,7 +63,7 @@ public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment { } protected String loadFile(@NonNls @TestDataFile String name) throws IOException { - return JetTestUtils.doLoadFile(myFullDataPath, name); + return KotlinTestUtils.doLoadFile(myFullDataPath, name); } protected KtFile createPsiFile(@Nullable String testName, @Nullable String fileName, String text) { @@ -71,7 +71,7 @@ public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment { Assert.assertNotNull(testName); fileName = testName + ".kt"; } - return JetTestUtils.createFile(fileName, text, getProject()); + return KotlinTestUtils.createFile(fileName, text, getProject()); } protected KtFile loadPsiFile(String name) { diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java index c4aaabd6a47..8acec9aa4d6 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java +++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java @@ -32,6 +32,6 @@ public abstract class KotlinTestWithEnvironmentManagement extends UsefulTestCase @NotNull protected KotlinCoreEnvironment createEnvironmentWithJdk(@NotNull ConfigurationKind configurationKind, @NotNull TestJdkKind jdkKind) { - return JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(getTestRootDisposable(), configurationKind, jdkKind); + return KotlinTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(getTestRootDisposable(), configurationKind, jdkKind); } } diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java index 18a12fb72e8..2cae3ad349e 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java @@ -71,7 +71,7 @@ public class MockLibraryUtil { @NotNull String... extraClasspath ) { try { - File contentDir = JetTestUtils.tmpDir("testLibrary-" + jarName); + File contentDir = KotlinTestUtils.tmpDir("testLibrary-" + jarName); File classesDir = new File(contentDir, "classes"); @@ -85,7 +85,7 @@ public class MockLibraryUtil { if (!javaFiles.isEmpty()) { List classpath = new ArrayList(); classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath()); - classpath.add(JetTestUtils.getAnnotationsJar().getPath()); + classpath.add(KotlinTestUtils.getAnnotationsJar().getPath()); Collections.addAll(classpath, extraClasspath); // Probably no kotlin files were present, so dir might not have been created after kotlin compiler @@ -101,7 +101,7 @@ public class MockLibraryUtil { "-d", classesDir.getPath() ); - JetTestUtils.compileJavaFiles(javaFiles, options); + KotlinTestUtils.compileJavaFiles(javaFiles, options); } return createJarFile(contentDir, classesDir, sourcesPath, jarName, addSources); @@ -118,7 +118,7 @@ public class MockLibraryUtil { boolean addSources ) { try { - File contentDir = JetTestUtils.tmpDir("testLibrary-" + jarName); + File contentDir = KotlinTestUtils.tmpDir("testLibrary-" + jarName); File outDir = new File(contentDir, "out"); File outputFile = new File(outDir, jarName + ".js"); diff --git a/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java b/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java index d879e1caddd..e01c3f98072 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java +++ b/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java @@ -26,6 +26,6 @@ public abstract class TestCaseWithTmpdir extends UsefulTestCase { @Override protected void setUp() throws Exception { super.setUp(); - tmpdir = JetTestUtils.tmpDirForTest(this); + tmpdir = KotlinTestUtils.tmpDirForTest(this); } } diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index a4c8a1ba45f..a8d27fce08e 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.renderer.*; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.MemberComparator; import org.jetbrains.kotlin.resolve.scopes.KtScope; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; @@ -266,7 +266,7 @@ public class RecursiveDescriptorComparator { } if (txtFile != null) { - JetTestUtils.assertEqualsToFile(txtFile, actualSerialized); + KotlinTestUtils.assertEqualsToFile(txtFile, actualSerialized); } } diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java index f8ea0279933..3ca803fe285 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; @@ -36,15 +36,15 @@ import java.util.List; public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment { @Override protected KotlinCoreEnvironment createEnvironment() { - return JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable()); + return KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable()); } public void testRecursive() throws Exception { File ktFile = new File("compiler/testData/recursiveProcessor/declarations.kt"); File txtFile = new File("compiler/testData/recursiveProcessor/declarations.txt"); String text = FileUtil.loadFile(ktFile, true); - KtFile jetFile = JetTestUtils.createFile("declarations.kt", text, getEnvironment().getProject()); - AnalysisResult result = JetTestUtils.analyzeFile(jetFile, getEnvironment()); + KtFile jetFile = KotlinTestUtils.createFile("declarations.kt", text, getEnvironment().getProject()); + AnalysisResult result = KotlinTestUtils.analyzeFile(jetFile, getEnvironment()); PackageViewDescriptor testPackage = result.getModuleDescriptor().getPackage(FqName.topLevel(Name.identifier("test"))); List descriptors = recursivelyCollectDescriptors(testPackage); diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java index eb610b8fea2..13233f44077 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java @@ -45,7 +45,7 @@ import java.util.List; import static org.jetbrains.kotlin.frontend.di.InjectionKt.createLazyResolveSession; public class DefaultModalityModifiersTest extends KotlinLiteFixture { - private final JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase(); + private final DefaultModalityModifiersTestCase tc = new DefaultModalityModifiersTestCase(); @Override protected KotlinCoreEnvironment createEnvironment() { @@ -64,7 +64,7 @@ public class DefaultModalityModifiersTest extends KotlinLiteFixture { super.tearDown(); } - public class JetDefaultModalityModifiersTestCase { + public class DefaultModalityModifiersTestCase { private final ModuleDescriptorImpl root = KotlinTestUtils.createEmptyModule(""); private DescriptorResolver descriptorResolver; private FunctionDescriptorResolver functionDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeBindingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/types/TypeBindingTestGenerated.java index 729ec1d8f57..86c50a8e97b 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeBindingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeBindingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.types; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,124 +30,124 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/type/binding") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetTypeBindingTestGenerated extends AbstractJetTypeBindingTest { +public class TypeBindingTestGenerated extends AbstractTypeBindingTest { public void testAllFilesPresentInBinding() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/type/binding/explicit") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Explicit extends AbstractJetTypeBindingTest { + public static class Explicit extends AbstractTypeBindingTest { public void testAllFilesPresentInExplicit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding/explicit"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding/explicit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conflictingProjection.kt") public void testConflictingProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/conflictingProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/conflictingProjection.kt"); doTest(fileName); } @TestMetadata("conflictingProjection2.kt") public void testConflictingProjection2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/conflictingProjection2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/conflictingProjection2.kt"); doTest(fileName); } @TestMetadata("errorPair.kt") public void testErrorPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/errorPair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/errorPair.kt"); doTest(fileName); } @TestMetadata("errorWithProjection.kt") public void testErrorWithProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/errorWithProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/errorWithProjection.kt"); doTest(fileName); } @TestMetadata("functionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType.kt"); doTest(fileName); } @TestMetadata("functionType2.kt") public void testFunctionType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType2.kt"); doTest(fileName); } @TestMetadata("functionType3.kt") public void testFunctionType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/functionType3.kt"); doTest(fileName); } @TestMetadata("inProjection.kt") public void testInProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/inProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/inProjection.kt"); doTest(fileName); } @TestMetadata("int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/int.kt"); doTest(fileName); } @TestMetadata("list0.kt") public void testList0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/list0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/list0.kt"); doTest(fileName); } @TestMetadata("list2.kt") public void testList2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/list2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/list2.kt"); doTest(fileName); } @TestMetadata("nullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/nullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/nullableType.kt"); doTest(fileName); } @TestMetadata("outProjection.kt") public void testOutProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/outProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/outProjection.kt"); doTest(fileName); } @TestMetadata("pair.kt") public void testPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/pair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/pair.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/simple.kt"); doTest(fileName); } @TestMetadata("star.kt") public void testStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/star.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/star.kt"); doTest(fileName); } @TestMetadata("typeWithBracket.kt") public void testTypeWithBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/typeWithBracket.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/typeWithBracket.kt"); doTest(fileName); } @TestMetadata("unresolvedType.kt") public void testUnresolvedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/unresolvedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/explicit/unresolvedType.kt"); doTest(fileName); } } @@ -155,116 +155,116 @@ public class JetTypeBindingTestGenerated extends AbstractJetTypeBindingTest { @TestMetadata("compiler/testData/type/binding/implicit") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Implicit extends AbstractJetTypeBindingTest { + public static class Implicit extends AbstractTypeBindingTest { public void testAllFilesPresentInImplicit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding/implicit"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/type/binding/implicit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conflictingProjection.kt") public void testConflictingProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/conflictingProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/conflictingProjection.kt"); doTest(fileName); } @TestMetadata("conflictingProjection2.kt") public void testConflictingProjection2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/conflictingProjection2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/conflictingProjection2.kt"); doTest(fileName); } @TestMetadata("errorPair.kt") public void testErrorPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/errorPair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/errorPair.kt"); doTest(fileName); } @TestMetadata("errorWithProjection.kt") public void testErrorWithProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/errorWithProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/errorWithProjection.kt"); doTest(fileName); } @TestMetadata("functionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType.kt"); doTest(fileName); } @TestMetadata("functionType2.kt") public void testFunctionType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType2.kt"); doTest(fileName); } @TestMetadata("functionType3.kt") public void testFunctionType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/functionType3.kt"); doTest(fileName); } @TestMetadata("inProjection.kt") public void testInProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/inProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/inProjection.kt"); doTest(fileName); } @TestMetadata("int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/int.kt"); doTest(fileName); } @TestMetadata("list0.kt") public void testList0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/list0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/list0.kt"); doTest(fileName); } @TestMetadata("list2.kt") public void testList2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/list2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/list2.kt"); doTest(fileName); } @TestMetadata("nullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/nullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/nullableType.kt"); doTest(fileName); } @TestMetadata("outProjection.kt") public void testOutProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/outProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/outProjection.kt"); doTest(fileName); } @TestMetadata("pair.kt") public void testPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/pair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/pair.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/simple.kt"); doTest(fileName); } @TestMetadata("star.kt") public void testStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/star.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/star.kt"); doTest(fileName); } @TestMetadata("typeWithBracket.kt") public void testTypeWithBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/typeWithBracket.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/typeWithBracket.kt"); doTest(fileName); } @TestMetadata("unresolvedType.kt") public void testUnresolvedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/unresolvedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/type/binding/implicit/unresolvedType.kt"); doTest(fileName); } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java index afba0993c0c..6547d8145ca 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java @@ -43,9 +43,8 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.*; -import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.tests.di.ContainerForTests; import org.jetbrains.kotlin.tests.di.InjectionKt; @@ -68,7 +67,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { protected void setUp() throws Exception { super.setUp(); - container = InjectionKt.createContainerForTests(getProject(), JetTestUtils.createEmptyModule()); + container = InjectionKt.createContainerForTests(getProject(), KotlinTestUtils.createEmptyModule()); scope = getContextScope(); } diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index df9865a4349..9427a3b3376 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -37,14 +37,14 @@ 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.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinLiteFixture; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.tests.di.InjectionKt; import java.util.Map; import java.util.Set; -public class TypeUnifierTest extends JetLiteFixture { +public class TypeUnifierTest extends KotlinLiteFixture { private Set variables; private KotlinBuiltIns builtIns; @@ -62,7 +62,7 @@ public class TypeUnifierTest extends JetLiteFixture { super.setUp(); - ModuleDescriptorImpl module = JetTestUtils.createEmptyModule(); + ModuleDescriptorImpl module = KotlinTestUtils.createEmptyModule(); builtIns = module.getBuiltIns(); typeResolver = InjectionKt.createContainerForTests(getProject(), module).getTypeResolver(); x = createTypeVariable("X"); @@ -212,7 +212,7 @@ public class TypeUnifierTest extends JetLiteFixture { KtTypeReference typeReference = projection.getTypeReference(); assert typeReference != null; - KotlinType type = typeResolver.resolveType(TypeTestUtilsKt.asLexicalScope(withX), typeReference, JetTestUtils.DUMMY_TRACE, true); + KotlinType type = typeResolver.resolveType(TypeTestUtilsKt.asLexicalScope(withX), typeReference, KotlinTestUtils.DUMMY_TRACE, true); return new TypeProjectionImpl(getProjectionKind(typeStr, projection), type); } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 945c99dcea9..bd676d64014 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -32,10 +32,10 @@ import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsR import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxInlineCodegenTest -import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest +import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest -import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest -import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase +import org.jetbrains.kotlin.formatter.AbstractFormatterTest +import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.* import org.jetbrains.kotlin.generators.tests.generator.TestGenerator.TargetBackend import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords @@ -60,8 +60,8 @@ import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletio import org.jetbrains.kotlin.idea.configuration.AbstractConfigureProjectByChangingFileTest import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest -import org.jetbrains.kotlin.idea.debugger.AbstractJetPositionManagerTest import org.jetbrains.kotlin.idea.debugger.AbstractKotlinSteppingTest +import org.jetbrains.kotlin.idea.debugger.AbstractPositionManagerTest import org.jetbrains.kotlin.idea.debugger.AbstractSmartStepIntoTest import org.jetbrains.kotlin.idea.debugger.evaluate.* import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractCommonDecompiled import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractCommonDecompiledTextTest import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractJsDecompiledTextFromJsMetadataTest import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractJvmDecompiledTextTest -import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractJetQuickDocProviderTest +import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest import org.jetbrains.kotlin.idea.highlighter.* @@ -88,8 +88,8 @@ import org.jetbrains.kotlin.idea.parameterInfo.AbstractParameterInfoTest import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest import org.jetbrains.kotlin.idea.refactoring.inline.AbstractInlineTest -import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractJetExtractionTest -import org.jetbrains.kotlin.idea.refactoring.move.AbstractJetMoveTest +import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractExtractionTest +import org.jetbrains.kotlin.idea.refactoring.move.AbstractMoveTest import org.jetbrains.kotlin.idea.refactoring.pullUp.AbstractPullUpTest import org.jetbrains.kotlin.idea.refactoring.pushDown.AbstractPushDownTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest @@ -116,8 +116,8 @@ import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeSha import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidXml2KConversionTest import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest -import org.jetbrains.kotlin.parsing.AbstractJetParsingTest -import org.jetbrains.kotlin.psi.patternMatching.AbstractJetPsiUnifierTest +import org.jetbrains.kotlin.parsing.AbstractParsingTest +import org.jetbrains.kotlin.psi.patternMatching.AbstractPsiUnifierTest import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.kotlin.renderer.AbstractFunctionDescriptorInExpressionRendererTest import org.jetbrains.kotlin.repl.AbstractReplInterpreterTest @@ -127,10 +127,10 @@ import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.resolve.calls.AbstractResolvedConstructorDelegationCallsTests import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractCompileTimeConstantEvaluatorTest import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest -import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest +import org.jetbrains.kotlin.safeDelete.AbstractSafeDeleteTest import org.jetbrains.kotlin.serialization.AbstractLocalClassProtoTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest -import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest +import org.jetbrains.kotlin.types.AbstractTypeBindingTest import java.io.File import java.util.* import java.util.regex.Pattern @@ -140,21 +140,21 @@ fun main(args: Array) { testGroup("compiler/tests", "compiler/testData") { - testClass() { + testClass() { model("diagnostics/tests") model("diagnostics/tests/script", extension = "kts") model("codegen/box/diagnostics") } - testClass() { + testClass() { model("diagnostics/testsWithStdLib") } - testClass() { + testClass() { model("diagnostics/testsWithJsStdLib") } - testClass() { + testClass() { model("diagnostics/testsWithJsStdLibAndBackendCompilation") } @@ -174,7 +174,7 @@ fun main(args: Array) { model("constraintSystem", extension = "constraints") } - testClass() { + testClass() { model("psi", testMethod = "doParsingTest", pattern = "^(.*)\\.kts?$") model("parseCodeFragment/expression", testMethod = "doExpressionCodeFragmentParsingTest", extension = "kt") model("parseCodeFragment/block", testMethod = "doBlockCodeFragmentParsingTest", extension = "kt") @@ -334,7 +334,7 @@ fun main(args: Array) { model("asJava/lightClasses") } - testClass() { + testClass() { model("type/binding") } @@ -352,7 +352,7 @@ fun main(args: Array) { testClass("BlackBoxWithJava8CodegenTestGenerated") { model("codegen/java8/boxWithJava", testMethod = "doTestWithJava", extension = null, recursive = true, excludeParentDirs = true) } - testClass("JetDiagnosticsWithJava8TestGenerated") { + testClass("DiagnosticsWithJava8TestGenerated") { model("diagnostics/testsWithJava8") } } @@ -372,7 +372,7 @@ fun main(args: Array) { model("resolve/partialBodyResolve") } - testClass() { + testClass() { model("checker", recursive = false) model("checker/regression") model("checker/recovery") @@ -390,7 +390,7 @@ fun main(args: Array) { model("kotlinAndJavaChecker/javaAgainstKotlin") } - testClass() { + testClass() { model("unifier") } @@ -403,7 +403,7 @@ fun main(args: Array) { model("quickfix.special/codeFragmentAutoImport", extension = "kt", recursive = false) } - testClass() { + testClass() { model("checker/js") } @@ -475,7 +475,7 @@ fun main(args: Array) { model("intentions", pattern = "^([\\w\\-_]+)\\.kt$") } - testClass() { + testClass() { model("intentions", pattern = "^(inspections\\.test)$", singleClass = true) model("inspections", pattern = "^(inspections\\.test)$", singleClass = true) } @@ -513,11 +513,11 @@ fun main(args: Array) { model("codeInsight/unwrapAndRemove/unwrapLambda", testMethod = "doTestLambdaUnwrapper") } - testClass() { + testClass() { model("editor/quickDoc", pattern = """^([^_]+)\.[^\.]*$""") } - testClass() { + testClass() { model("safeDelete/deleteClass/kotlinClass", testMethod = "doClassTest") model("safeDelete/deleteClass/kotlinClassWithJava", testMethod = "doClassTestWithJava") model("safeDelete/deleteObject/kotlinObject", testMethod = "doObjectTest") @@ -553,7 +553,7 @@ fun main(args: Array) { model("resolve/referenceToJavaWithWrongFileStructure", recursive = false) } - testClass() { + testClass() { model("findUsages/kotlin", pattern = """^(.+)\.0\.kt$""") model("findUsages/java", pattern = """^(.+)\.0\.java$""") model("findUsages/propertyFiles", pattern = """^(.+)\.0\.properties$""") @@ -563,7 +563,7 @@ fun main(args: Array) { model("findUsages/libraryUsages", pattern = """^(.+)\.0\.kt$""") } - testClass() { + testClass() { model("refactoring/move", extension = "test", singleClass = true) } @@ -571,7 +571,7 @@ fun main(args: Array) { model("multiFileIntentions", extension = "test", singleClass = true, filenameStartsLowerCase = true) } - testClass() { + testClass() { model("multiFileInspections", extension = "test", singleClass = true) } @@ -582,13 +582,13 @@ fun main(args: Array) { model("configuration/js-maven", extension = null, recursive = false, testMethod = "doTestWithJSMaven") } - testClass() { + testClass() { model("formatter", pattern = """^([^\.]+)\.after\.kt.*$""") model("formatter", pattern = """^([^\.]+)\.after\.inv\.kt.*$""", testMethod = "doTestInverted", testClassName = "FormatterInverted") } - testClass() { + testClass() { model("indentationOnNewline", pattern = """^([^\.]+)\.after\.kt.*$""", testMethod = "doNewlineTest", testClassName = "DirectSettings") model("indentationOnNewline", pattern = """^([^\.]+)\.after\.inv\.kt.*$""", testMethod = "doNewlineTestWithInvert", @@ -675,7 +675,7 @@ fun main(args: Array) { model("editor/optimizeImports", pattern = """^([^\.]+)\.kt$""") } - testClass() { + testClass() { model("debugger/positionManager", recursive = false, extension = "kt", testClassName = "SingleFile") model("debugger/positionManager", recursive = false, extension = null, testClassName = "MultiFile") } @@ -707,7 +707,7 @@ fun main(args: Array) { model("multiFileHighlighting", recursive = false) } - testClass() { + testClass() { model("refactoring/introduceVariable", extension = "kt", testMethod = "doIntroduceVariableTest") model("refactoring/extractFunction", extension = "kt", testMethod = "doExtractFunctionTest") model("refactoring/introduceProperty", extension = "kt", testMethod = "doIntroducePropertyTest") 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 121c3299ec0..366961cd634 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.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; @@ -187,7 +187,7 @@ public class SimpleTestClassModel implements TestClassModel { @Override public String getDataString() { - return JetTestUtils.getFilePath(rootFile); + return KotlinTestUtils.getFilePath(rootFile); } @Nullable @@ -216,8 +216,8 @@ public class SimpleTestClassModel implements TestClassModel { exclude.append("\""); } String assertTestsPresentStr = String.format( - "JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"), %s%s);", - JetTestUtils.getFilePath(rootFile), StringUtil.escapeStringCharacters(filenamePattern.pattern()), recursive, exclude + "KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"), %s%s);", + KotlinTestUtils.getFilePath(rootFile), StringUtil.escapeStringCharacters(filenamePattern.pattern()), recursive, exclude ); p.println(assertTestsPresentStr); } 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 81444c2b580..4781441cfb0 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; @@ -73,14 +73,14 @@ public class SimpleTestMethodModel implements TestMethodModel { @Override public void generateBody(@NotNull Printer p) { - String filePath = JetTestUtils.getFilePath(file) + (file.isDirectory() ? "/" : ""); - p.println("String fileName = JetTestUtils.navigationMetadata(\"", filePath, "\");"); + String filePath = KotlinTestUtils.getFilePath(file) + (file.isDirectory() ? "/" : ""); + p.println("String fileName = KotlinTestUtils.navigationMetadata(\"", filePath, "\");"); p.println(doTestMethodName, "(fileName);"); } @Override public String getDataString() { - return JetTestUtils.getFilePath(new File(FileUtil.getRelativePath(rootDir, file))); + return KotlinTestUtils.getFilePath(new File(FileUtil.getRelativePath(rootDir, file))); } private boolean isIgnored() { 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 b989c580830..f16b130c55a 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.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; @@ -120,7 +120,7 @@ public class SingleClassTestModel implements TestClassModel { @Override public String getDataString() { - return JetTestUtils.getFilePath(rootFile); + return KotlinTestUtils.getFilePath(rootFile); } @Nullable @@ -143,8 +143,8 @@ public class SingleClassTestModel implements TestClassModel { @Override public void generateBody(@NotNull Printer p) { String assertTestsPresentStr = String.format( - "JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"));", - JetTestUtils.getFilePath(rootFile), StringUtil.escapeStringCharacters(filenamePattern.pattern()) + "KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"));", + KotlinTestUtils.getFilePath(rootFile), StringUtil.escapeStringCharacters(filenamePattern.pattern()) ); p.println(assertTestsPresentStr); } 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 eb09a697ca8..6847c535a2d 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.kotlin.utils.Printer; import org.junit.runner.RunWith; @@ -85,7 +85,7 @@ public class TestGenerator { p.println(); p.println("import com.intellij.testFramework.TestDataPath;"); p.println("import ", RUNNER.getCanonicalName(), ";"); - p.println("import " + JetTestUtils.class.getCanonicalName() + ";"); + p.println("import " + KotlinTestUtils.class.getCanonicalName() + ";"); if (!suiteClassPackage.equals(baseTestClassPackage)) { p.println("import " + baseTestClassPackage + "." + baseTestClassName + ";"); } @@ -95,7 +95,7 @@ public class TestGenerator { p.println("import java.io.File;"); p.println("import java.util.regex.Pattern;"); p.println(); - p.println("/** This class is generated by {@link ", JetTestUtils.TEST_GENERATOR_NAME, "}. DO NOT MODIFY MANUALLY */"); + p.println("/** This class is generated by {@link ", KotlinTestUtils.TEST_GENERATOR_NAME, "}. DO NOT MODIFY MANUALLY */"); generateSuppressAllWarnings(p); diff --git a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt index d4a29ea803e..4148a90d1c3 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.generators.test.evaluate import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.generators.evaluate.DEST_FILE import org.jetbrains.kotlin.generators.evaluate.generate -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils public class GenerateOperationsMapTest : UsefulTestCase() { public fun testGeneratedDataIsUpToDate(): Unit { val text = generate() - JetTestUtils.assertEqualsToFile(DEST_FILE, text) + KotlinTestUtils.assertEqualsToFile(DEST_FILE, text) } } diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt index 0ceabefef1f..9a01f854003 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/ProtoBufCompareConsistencyTest.kt @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.generators.protobuf import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public class ProtoBufCompareConsistencyTest : UsefulTestCase() { public fun testAlreadyGenerated() { - val testDir = JetTestUtils.tmpDir("testDirectory") + val testDir = KotlinTestUtils.tmpDir("testDirectory") val newFile = File(testDir, "ProtoCompareGenerated.kt") GenerateProtoBufCompare.generate(newFile) - JetTestUtils.assertEqualsToFile(newFile, FileUtil.loadFile(GenerateProtoBufCompare.DEST_FILE)) + KotlinTestUtils.assertEqualsToFile(newFile, FileUtil.loadFile(GenerateProtoBufCompare.DEST_FILE)) } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt index 3d6f4461987..e9535e9f23c 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractCompiledKotlinInJavaCompletionTest.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -public abstract class AbstractCompiledKotlinInJavaCompletionTest : JetFixtureCompletionBaseTestCase() { +public abstract class AbstractCompiledKotlinInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { override fun getPlatform() = JvmPlatform override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(COMPLETION_TEST_DATA_BASE_PATH + "/injava/mockLib", false) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java index da5840f40e9..678eb9e0273 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJSBasicCompletionTest.java @@ -17,16 +17,14 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.codeInsight.completion.CompletionType; -import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager; import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor; import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.resolve.TargetPlatform; -public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase { +public abstract class AbstractJSBasicCompletionTest extends KotlinFixtureCompletionBaseTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java index 3299a3a6816..3fd1f95dae6 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmBasicCompletionTest.java @@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase { +public abstract class AbstractJvmBasicCompletionTest extends KotlinFixtureCompletionBaseTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java index d28b3af3fde..29a82d6ffd4 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmSmartCompletionTest.java @@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase { +public abstract class AbstractJvmSmartCompletionTest extends KotlinFixtureCompletionBaseTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } @NotNull diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt index a17a3f63044..98743d8cce5 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJvmWithLibBasicCompletionTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -public abstract class AbstractJvmWithLibBasicCompletionTest : JetFixtureCompletionBaseTestCase() { +public abstract class AbstractJvmWithLibBasicCompletionTest : KotlinFixtureCompletionBaseTestCase() { private val TEST_PATH = COMPLETION_TEST_DATA_BASE_PATH + "/basic/withLib" override fun getProjectDescriptor(): LightProjectDescriptor { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt index 66898683555..1d9b93bebec 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKeywordCompletionTest.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.completion.test import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.kotlin.idea.completion.KeywordLookupObject -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTestCase() { +public abstract class AbstractKeywordCompletionTest : KotlinFixtureCompletionBaseTestCase() { override fun getPlatform() = JvmPlatform override fun defaultCompletionType() = CompletionType.BASIC @@ -32,7 +32,7 @@ public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTe return items.filter { it.`object` is KeywordLookupObject }.toTypedArray() } - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE override fun defaultInvocationCount() = 1 } \ No newline at end of file diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt index 6b71bc4820c..fd0bacacf33 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractKotlinSourceInJavaCompletionTest.kt @@ -26,7 +26,7 @@ import junit.framework.TestCase import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import java.io.File -public abstract class AbstractKotlinSourceInJavaCompletionTest : JetFixtureCompletionBaseTestCase() { +public abstract class AbstractKotlinSourceInJavaCompletionTest : KotlinFixtureCompletionBaseTestCase() { override fun getPlatform() = JvmPlatform override fun doTest(testPath: String) { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java index b6bb69fc93a..6540e32a801 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,168 +32,168 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotationParameter.java") public void testAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java"); doTest(fileName); } @TestMetadata("Class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java"); doTest(fileName); } @TestMetadata("ClassMembers.java") public void testClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java"); doTest(fileName); } @TestMetadata("ClassObject.java") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java"); doTest(fileName); } @TestMetadata("ClassObjectField.java") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java"); doTest(fileName); } @TestMetadata("ClassesFromNamespace.java") public void testClassesFromNamespace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java"); doTest(fileName); } @TestMetadata("EnumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImpl.java") public void testInterfaceDefaultImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplImportedMembers.java") public void testInterfaceDefaultImplImportedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplMembers.java") public void testInterfaceDefaultImplMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java") public void testInterfaceDefaultImplStaticImportedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java"); doTest(fileName); } @TestMetadata("MultiFileFacade.java") public void testMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java"); doTest(fileName); } @TestMetadata("MultiFileFacadeMembers.java") public void testMultiFileFacadeMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java"); doTest(fileName); } @TestMetadata("MultiFileFacadeNoImport.java") public void testMultiFileFacadeNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java"); doTest(fileName); } @TestMetadata("Nested.java") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java"); doTest(fileName); } @TestMetadata("NestedClassMembers.java") public void testNestedClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java"); doTest(fileName); } @TestMetadata("NestedClassMembers2.java") public void testNestedClassMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java"); doTest(fileName); } @TestMetadata("NestedObjectInstance.java") public void testNestedObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java"); doTest(fileName); } @TestMetadata("ObjectInClassObjects.java") public void testObjectInClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java"); doTest(fileName); } @TestMetadata("ObjectInstance.java") public void testObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java"); doTest(fileName); } @TestMetadata("RenamedFacade.java") public void testRenamedFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java"); doTest(fileName); } @TestMetadata("SingleFileFacade.java") public void testSingleFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java"); doTest(fileName); } @TestMetadata("SingleFileFacadeMembers.java") public void testSingleFileFacadeMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java"); doTest(fileName); } @TestMetadata("SingleFileFacadeNoImport.java") public void testSingleFileFacadeNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java"); doTest(fileName); } @TestMetadata("Subpackage.java") public void testSubpackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java"); doTest(fileName); } @TestMetadata("TopLevelMembers.java") public void testTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java"); doTest(fileName); } @TestMetadata("TraitMember.java") public void testTraitMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); doTest(fileName); } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt index ec9db294175..f8be71dd75a 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompletionTestUtil.kt @@ -20,12 +20,12 @@ import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.kotlin.resolve.TargetPlatform -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert val RELATIVE_COMPLETION_TEST_DATA_BASE_PATH = "idea/idea-completion/testData" -val COMPLETION_TEST_DATA_BASE_PATH = JetTestUtils.getHomeDirectory() + "/" + RELATIVE_COMPLETION_TEST_DATA_BASE_PATH +val COMPLETION_TEST_DATA_BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/" + RELATIVE_COMPLETION_TEST_DATA_BASE_PATH fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (CompletionType, Int) -> Array?, defaultCompletionType: CompletionType = CompletionType.BASIC, defaultInvocationCount: Int = 0) { testWithAutoCompleteSetting(fileText) { diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java index cb275c5312a..cc20aeaf909 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -35,719 +35,719 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes public static class Common extends AbstractJSBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") public void testAfterFloatOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterFloatOnNewLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterFloatOnNewLine.kt"); doTest(fileName); } @TestMetadata("AfterIntSeparatedWithComments.kt") public void testAfterIntSeparatedWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterIntSeparatedWithComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterIntSeparatedWithComments.kt"); doTest(fileName); } public void testAllFilesPresentInCommon() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("BasicAny.kt") public void testBasicAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicAny.kt"); doTest(fileName); } @TestMetadata("BasicInt.kt") public void testBasicInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicInt.kt"); doTest(fileName); } @TestMetadata("BeforeDotInCall.kt") public void testBeforeDotInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BeforeDotInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BeforeDotInCall.kt"); doTest(fileName); } @TestMetadata("CallLocalLambda.kt") public void testCallLocalLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CallLocalLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CallLocalLambda.kt"); doTest(fileName); } @TestMetadata("classObjectElementsInClass.kt") public void testClassObjectElementsInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/classObjectElementsInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/classObjectElementsInClass.kt"); doTest(fileName); } @TestMetadata("ClassRedeclaration1.kt") public void testClassRedeclaration1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration1.kt"); doTest(fileName); } @TestMetadata("ClassRedeclaration2.kt") public void testClassRedeclaration2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration2.kt"); doTest(fileName); } @TestMetadata("CompletionInSetter.kt") public void testCompletionInSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CompletionInSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CompletionInSetter.kt"); doTest(fileName); } @TestMetadata("ExtendClassName.kt") public void testExtendClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendClassName.kt"); doTest(fileName); } @TestMetadata("ExtendQualifiedClassName.kt") public void testExtendQualifiedClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendQualifiedClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendQualifiedClassName.kt"); doTest(fileName); } @TestMetadata("ExtensionForProperty.kt") public void testExtensionForProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionForProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionForProperty.kt"); doTest(fileName); } @TestMetadata("ExtensionFunReceiver.kt") public void testExtensionFunReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionFunReceiverForce.kt") public void testExtensionFunReceiverForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiverForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiverForce.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctionInClassObject.kt") public void testExtensionFunctionInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunctionInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunctionInClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionInsideFunction.kt") public void testExtensionInsideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionInsideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionInsideFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionToIntInFloatStyle.kt") public void testExtensionToIntInFloatStyle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionToIntInFloatStyle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionToIntInFloatStyle.kt"); doTest(fileName); } @TestMetadata("ExtensionWithAdditionalTypeParameters.kt") public void testExtensionWithAdditionalTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithAdditionalTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithAdditionalTypeParameters.kt"); doTest(fileName); } @TestMetadata("ExtensionWithGenericParamInReceiver.kt") public void testExtensionWithGenericParamInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionWithGenericReceiver.kt") public void testExtensionWithGenericReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionWithInternalGenericParameters.kt") public void testExtensionWithInternalGenericParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt"); doTest(fileName); } @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt") public void testExtensionWithManyTypeParamsInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); doTest(fileName); } @TestMetadata("FromImports.kt") public void testFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FromImports.kt"); doTest(fileName); } @TestMetadata("FunctionCompletionFormatting.kt") public void testFunctionCompletionFormatting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionCompletionFormatting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionCompletionFormatting.kt"); doTest(fileName); } @TestMetadata("FunctionVariableCallArgument.kt") public void testFunctionVariableCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionVariableCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionVariableCallArgument.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunReceiver1.kt") public void testGenericExtensionFunReceiver1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver1.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunReceiver2.kt") public void testGenericExtensionFunReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver2.kt"); doTest(fileName); } @TestMetadata("GenericKotlinClass.kt") public void testGenericKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericKotlinClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericKotlinClass.kt"); doTest(fileName); } @TestMetadata("GetPrefixForProperties.kt") public void testGetPrefixForProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GetPrefixForProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GetPrefixForProperties.kt"); doTest(fileName); } @TestMetadata("ImportedEnumMembers.kt") public void testImportedEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedEnumMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedEnumMembers.kt"); doTest(fileName); } @TestMetadata("ImportedMemberFromObject.kt") public void testImportedMemberFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedMemberFromObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedMemberFromObject.kt"); doTest(fileName); } @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InCallExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InCallExpression.kt"); doTest(fileName); } @TestMetadata("InClassInitializer.kt") public void testInClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassInitializer.kt"); doTest(fileName); } @TestMetadata("InClassObject.kt") public void testInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassObject.kt"); doTest(fileName); } @TestMetadata("InClassPropertyAccessor.kt") public void testInClassPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InEmptyImport.kt") public void testInEmptyImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyImport.kt"); doTest(fileName); } @TestMetadata("InEmptyPackage.kt") public void testInEmptyPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyPackage.kt"); doTest(fileName); } @TestMetadata("InExpressionNoPrefix.kt") public void testInExpressionNoPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt"); doTest(fileName); } @TestMetadata("InExtendTypeAnnotation.kt") public void testInExtendTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("InFileWithMultiDeclaration.kt") public void testInFileWithMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithMultiDeclaration.kt"); doTest(fileName); } @TestMetadata("InFileWithTypedef.kt") public void testInFileWithTypedef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithTypedef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithTypedef.kt"); doTest(fileName); } @TestMetadata("InFunInClassInitializer.kt") public void testInFunInClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunInClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunInClassInitializer.kt"); doTest(fileName); } @TestMetadata("InFunctionArguments.kt") public void testInFunctionArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunctionArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunctionArguments.kt"); doTest(fileName); } @TestMetadata("InGlobalPropertyInitializer.kt") public void testInGlobalPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InGlobalPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InGlobalPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("InImport.kt") public void testInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InImport.kt"); doTest(fileName); } @TestMetadata("InInitializerInPropertyAccessor.kt") public void testInInitializerInPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInitializerInPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInitializerInPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InInnerClass.kt") public void testInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInnerClass.kt"); doTest(fileName); } @TestMetadata("InLambda.kt") public void testInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLambda.kt"); doTest(fileName); } @TestMetadata("InLocalObjectDeclaration.kt") public void testInLocalObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLocalObjectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLocalObjectDeclaration.kt"); doTest(fileName); } @TestMetadata("InLongDotQualifiedExpression.kt") public void testInLongDotQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLongDotQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLongDotQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("InMiddleOfPackage.kt") public void testInMiddleOfPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt"); doTest(fileName); } @TestMetadata("InMiddleOfPackageDirective.kt") public void testInMiddleOfPackageDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackageDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackageDirective.kt"); doTest(fileName); } @TestMetadata("InNestedClass.kt") public void testInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InNestedClass.kt"); doTest(fileName); } @TestMetadata("InObjectInDelegationSpecifier.kt") public void testInObjectInDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InObjectInDelegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InObjectInDelegationSpecifier.kt"); doTest(fileName); } @TestMetadata("InPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPackage.kt"); doTest(fileName); } @TestMetadata("InParametersTypes.kt") public void testInParametersTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypes.kt"); doTest(fileName); } @TestMetadata("InParametersTypesForce.kt") public void testInParametersTypesForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypesForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypesForce.kt"); doTest(fileName); } @TestMetadata("InPropertyAccessor.kt") public void testInPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InPropertyInitializer.kt") public void testInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorBody.kt") public void testInSecondaryConstructorBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorBody.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorDefaultParameter.kt") public void testInSecondaryConstructorDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDefaultParameter.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorDelegationCall.kt") public void testInSecondaryConstructorDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDelegationCall.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorFirstDefaultParameter.kt") public void testInSecondaryConstructorFirstDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorFirstDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorFirstDefaultParameter.kt"); doTest(fileName); } @TestMetadata("InTypeAnnotation.kt") public void testInTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("InfixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCall.kt"); doTest(fileName); } @TestMetadata("InfixCallNoSpecialLambdaArgumentItem.kt") public void testInfixCallNoSpecialLambdaArgumentItem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InnerClass.kt"); doTest(fileName); } @TestMetadata("InsideAnonymousClass.kt") public void testInsideAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InsideAnonymousClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InsideAnonymousClass.kt"); doTest(fileName); } @TestMetadata("InterfaceNameBeforeRunBug.kt") public void testInterfaceNameBeforeRunBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InterfaceNameBeforeRunBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InterfaceNameBeforeRunBug.kt"); doTest(fileName); } @TestMetadata("JavaPackage.kt") public void testJavaPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); doTest(fileName); } @TestMetadata("LocalMultideclarationValues.kt") public void testLocalMultideclarationValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/LocalMultideclarationValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/LocalMultideclarationValues.kt"); doTest(fileName); } @TestMetadata("NameWithDollars.kt") public void testNameWithDollars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NameWithDollars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NameWithDollars.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NamedObject.kt"); doTest(fileName); } @TestMetadata("NestedBuiltInClass.kt") public void testNestedBuiltInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedBuiltInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedBuiltInClass.kt"); doTest(fileName); } @TestMetadata("NestedClassBug.kt") public void testNestedClassBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassBug.kt"); doTest(fileName); } @TestMetadata("NestedClassNameForExtension.kt") public void testNestedClassNameForExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension.kt"); doTest(fileName); } @TestMetadata("NestedClassNameForExtension2.kt") public void testNestedClassNameForExtension2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension2.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnClassWithDefaultObject.kt") public void testNestedClassesOnClassWithDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithDefaultObject.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnClassWithNamedDefaultObject.kt") public void testNestedClassesOnClassWithNamedDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnDefaultObjectLiteral.kt") public void testNestedClassesOnDefaultObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnDefaultObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnDefaultObjectLiteral.kt"); doTest(fileName); } @TestMetadata("NoAutoInsertionOfNotImported.kt") public void testNoAutoInsertionOfNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoAutoInsertionOfNotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoAutoInsertionOfNotImported.kt"); doTest(fileName); } @TestMetadata("NoClassNameDuplication.kt") public void testNoClassNameDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt"); doTest(fileName); } @TestMetadata("NoEmptyPackage.kt") public void testNoEmptyPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEmptyPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEmptyPackage.kt"); doTest(fileName); } @TestMetadata("NoEnumEntryType.kt") public void testNoEnumEntryType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumEntryType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumEntryType.kt"); doTest(fileName); } @TestMetadata("NoEnumMembersFromImplicitQualifier.kt") public void testNoEnumMembersFromImplicitQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumMembersFromImplicitQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumMembersFromImplicitQualifier.kt"); doTest(fileName); } @TestMetadata("NoExtensionsAfterQualifier.kt") public void testNoExtensionsAfterQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoExtensionsAfterQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoExtensionsAfterQualifier.kt"); doTest(fileName); } @TestMetadata("NoLocalsDeclaredAhead.kt") public void testNoLocalsDeclaredAhead() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoLocalsDeclaredAhead.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoLocalsDeclaredAhead.kt"); doTest(fileName); } @TestMetadata("NoNestedClassAfterReceiver.kt") public void testNoNestedClassAfterReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassAfterReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassAfterReceiver.kt"); doTest(fileName); } @TestMetadata("NoNestedClassesFromImplicitQualifier.kt") public void testNoNestedClassesFromImplicitQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassesFromImplicitQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassesFromImplicitQualifier.kt"); doTest(fileName); } @TestMetadata("NoPackageFacadeClasses.kt") public void testNoPackageFacadeClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoPackageFacadeClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoPackageFacadeClasses.kt"); doTest(fileName); } @TestMetadata("NoParameterAnnotationInPresentation.kt") public void testNoParameterAnnotationInPresentation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt"); doTest(fileName); } @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt") public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); doTest(fileName); } @TestMetadata("ObjectInTypePosition.kt") public void testObjectInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectInTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectInTypePosition.kt"); doTest(fileName); } @TestMetadata("ObjectMembersFromNested.kt") public void testObjectMembersFromNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectMembersFromNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectMembersFromNested.kt"); doTest(fileName); } @TestMetadata("ObjectRedeclaration1.kt") public void testObjectRedeclaration1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration1.kt"); doTest(fileName); } @TestMetadata("ObjectRedeclaration2.kt") public void testObjectRedeclaration2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration2.kt"); doTest(fileName); } @TestMetadata("OverloadFunctions.kt") public void testOverloadFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/OverloadFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/OverloadFunctions.kt"); doTest(fileName); } @TestMetadata("PrivatesInSecondPressCompletion.kt") public void testPrivatesInSecondPressCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt"); doTest(fileName); } @TestMetadata("RecieverMembersFromExtAccessor.kt") public void testRecieverMembersFromExtAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtAccessor.kt"); doTest(fileName); } @TestMetadata("RecieverMembersFromExtFun.kt") public void testRecieverMembersFromExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt"); doTest(fileName); } @TestMetadata("SetPrefixForProperties.kt") public void testSetPrefixForProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt"); doTest(fileName); } @TestMetadata("ShortClassNamesInTypePosition.kt") public void testShortClassNamesInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ShortClassNamesInTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ShortClassNamesInTypePosition.kt"); doTest(fileName); } @TestMetadata("StandardJetArrayFirst.kt") public void testStandardJetArrayFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt"); doTest(fileName); } @TestMetadata("StandardJetDoubleFirst.kt") public void testStandardJetDoubleFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt"); doTest(fileName); } @TestMetadata("StringTemplate1.kt") public void testStringTemplate1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate1.kt"); doTest(fileName); } @TestMetadata("StringTemplate2.kt") public void testStringTemplate2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate2.kt"); doTest(fileName); } @TestMetadata("SubpackageInFun.kt") public void testSubpackageInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SubpackageInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SubpackageInFun.kt"); doTest(fileName); } @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt") public void testTopLevelClassCompletionInQualifiedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassCompletionInQualifiedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassCompletionInQualifiedCall.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName1.kt") public void testTopLevelClassName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName1.kt"); doTest(fileName); } @TestMetadata("topLevelClassName2.kt") public void testTopLevelClassName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/topLevelClassName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/topLevelClassName2.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName4.kt") public void testTopLevelClassName4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName4.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName5.kt") public void testTopLevelClassName5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName5.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName-3.kt") public void testTopLevelClassName_3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt"); doTest(fileName); } @TestMetadata("TypeArgCompletionBug.kt") public void testTypeArgCompletionBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgCompletionBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgCompletionBug.kt"); doTest(fileName); } @TestMetadata("TypeArgFromTheSameFile.kt") public void testTypeArgFromTheSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgFromTheSameFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgFromTheSameFile.kt"); doTest(fileName); } @TestMetadata("TypeArgOfOwnerClass.kt") public void testTypeArgOfOwnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgOfOwnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgOfOwnerClass.kt"); doTest(fileName); } @TestMetadata("TypeParameterFromOuterClass.kt") public void testTypeParameterFromOuterClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeParameterFromOuterClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeParameterFromOuterClass.kt"); doTest(fileName); } @TestMetadata("VariableClassName.kt") public void testVariableClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/VariableClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/VariableClassName.kt"); doTest(fileName); } @@ -756,174 +756,174 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Annotated.kt") public void testAnnotated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Annotated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Annotated.kt"); doTest(fileName); } @TestMetadata("AnnotationTarget.kt") public void testAnnotationTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated.kt"); doTest(fileName); } @TestMetadata("Deprecated2.kt") public void testDeprecated2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated2.kt"); doTest(fileName); } @TestMetadata("ForType.kt") public void testForType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ForType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ForType.kt"); doTest(fileName); } @TestMetadata("FunctionAnnotation1.kt") public void testFunctionAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt"); doTest(fileName); } @TestMetadata("FunctionAnnotation2.kt") public void testFunctionAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt"); doTest(fileName); } @TestMetadata("NoCatchParameterAutopopup.kt") public void testNoCatchParameterAutopopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoCatchParameterAutopopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoCatchParameterAutopopup.kt"); doTest(fileName); } @TestMetadata("NoSetterParameterAutopopup.kt") public void testNoSetterParameterAutopopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoSetterParameterAutopopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoSetterParameterAutopopup.kt"); doTest(fileName); } @TestMetadata("OnlyAnnotations.kt") public void testOnlyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/OnlyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/OnlyAnnotations.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation1.kt") public void testParameterAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation2.kt") public void testParameterAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation3.kt") public void testParameterAnnotation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation4.kt") public void testParameterAnnotation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation5.kt") public void testParameterAnnotation5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation6.kt") public void testParameterAnnotation6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation7.kt") public void testParameterAnnotation7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation8.kt") public void testParameterAnnotation8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation9.kt") public void testParameterAnnotation9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationArgs.kt") public void testParameterAnnotationArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationAutoPopup1.kt") public void testParameterAnnotationAutoPopup1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationAutoPopup2.kt") public void testParameterAnnotationAutoPopup2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation1.kt") public void testTopLevelAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation2.kt") public void testTopLevelAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation3.kt") public void testTopLevelAnnotation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation4.kt") public void testTopLevelAnnotation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotationArg1.kt") public void testTopLevelAnnotationArg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg1.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotationArg2.kt") public void testTopLevelAnnotationArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt"); doTest(fileName); } } @@ -933,90 +933,90 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class AutoPopup extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInAutoPopup() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/autoPopup"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/autoPopup"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutopopupInFunExtensionReceiver.kt") public void testAutopopupInFunExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/AutopopupInFunExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/AutopopupInFunExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunTypeArgument.kt") public void testGenericExtensionFunTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunTypeArgument2.kt") public void testGenericExtensionFunTypeArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument2.kt"); doTest(fileName); } @TestMetadata("NoAutoPopupAfterNumberLiteral.kt") public void testNoAutoPopupAfterNumberLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupAfterNumberLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupAfterNumberLiteral.kt"); doTest(fileName); } @TestMetadata("NoAutoPopupInValName.kt") public void testNoAutoPopupInValName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupInValName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupInValName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInExtFunName.kt") public void testNoAutopopupInExtFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInExtFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInExtFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInFunName.kt") public void testNoAutopopupInFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericExtFunName.kt") public void testNoAutopopupInGenericExtFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericExtFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericExtFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericFunName.kt") public void testNoAutopopupInGenericFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericValName.kt") public void testNoAutopopupInGenericValName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericValName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericValName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericVarName.kt") public void testNoAutopopupInGenericVarName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericVarName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericVarName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInVarName.kt") public void testNoAutopopupInVarName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInVarName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInVarName.kt"); doTest(fileName); } @TestMetadata("NoSecondPressCompletionInAutoPopup.kt") public void testNoSecondPressCompletionInAutoPopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoSecondPressCompletionInAutoPopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoSecondPressCompletionInAutoPopup.kt"); doTest(fileName); } @TestMetadata("OnlyScopedClassesWithoutExplicit.kt") public void testOnlyScopedClassesWithoutExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/OnlyScopedClassesWithoutExplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/OnlyScopedClassesWithoutExplicit.kt"); doTest(fileName); } } @@ -1027,107 +1027,107 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes public static class BoldOrGrayed extends AbstractJSBasicCompletionTest { @TestMetadata("AfterNullable.kt") public void testAfterNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullable.kt"); doTest(fileName); } @TestMetadata("AfterNullableAutoCast.kt") public void testAfterNullableAutoCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast.kt"); doTest(fileName); } @TestMetadata("AfterNullableAutoCast2.kt") public void testAfterNullableAutoCast2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast2.kt"); doTest(fileName); } public void testAllFilesPresentInBoldOrGrayed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImmediateExtensionMembers1.kt") public void testImmediateExtensionMembers1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers1.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers2.kt") public void testImmediateExtensionMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers2.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers3.kt") public void testImmediateExtensionMembers3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers3.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers4.kt") public void testImmediateExtensionMembers4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers4.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembersGeneric.kt") public void testImmediateExtensionMembersGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembersGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembersGeneric.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers1.kt") public void testImmediateMembers1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers1.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers2.kt") public void testImmediateMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers2.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers3.kt") public void testImmediateMembers3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers3.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers4.kt") public void testImmediateMembers4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers4.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers5.kt") public void testImmediateMembers5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers5.kt"); doTest(fileName); } @TestMetadata("InExtensionForNullable.kt") public void testInExtensionForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/InExtensionForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/InExtensionForNullable.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCast.kt") public void testNonPredictableSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCast.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCastWithWrongReturnType.kt") public void testNonPredictableSmartCastWithWrongReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCastWithWrongReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCastWithWrongReturnType.kt"); doTest(fileName); } @TestMetadata("SafeCallAfterNullable.kt") public void testSafeCallAfterNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt"); doTest(fileName); } } @@ -1137,36 +1137,36 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EmptyQualifier.kt") public void testEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifier.kt"); doTest(fileName); } @TestMetadata("EmptyQualifierInExtensionFun.kt") public void testEmptyQualifierInExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifierInExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifierInExtensionFun.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction.kt") public void testHigherOrderFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/HigherOrderFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/HigherOrderFunction.kt"); doTest(fileName); } @TestMetadata("NonEmptyQualifier.kt") public void testNonEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/NonEmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/NonEmptyQualifier.kt"); doTest(fileName); } @TestMetadata("SyntheticExtensions.kt") public void testSyntheticExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/SyntheticExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/SyntheticExtensions.kt"); doTest(fileName); } } @@ -1176,144 +1176,144 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Extensions extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ComplexCapture.kt") public void testComplexCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt"); doTest(fileName); } @TestMetadata("ComplexCapture2.kt") public void testComplexCapture2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtendedClass.kt") public void testExtensionInExtendedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClass.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtendedClassThis.kt") public void testExtensionInExtendedClassThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClassThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClassThis.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtension.kt") public void testExtensionInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtension.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtensionThis.kt") public void testExtensionInExtensionThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtensionThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtensionThis.kt"); doTest(fileName); } @TestMetadata("ExtensionOnFQObject.kt") public void testExtensionOnFQObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnFQObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnFQObject.kt"); doTest(fileName); } @TestMetadata("ExtensionOnNestedClassObject.kt") public void testExtensionOnNestedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnNestedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnNestedClassObject.kt"); doTest(fileName); } @TestMetadata("Extensions.kt") public void testExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/Extensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/Extensions.kt"); doTest(fileName); } @TestMetadata("InvalidTypeParameters.kt") public void testInvalidTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/InvalidTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/InvalidTypeParameters.kt"); doTest(fileName); } @TestMetadata("IrrelevantExtension.kt") public void testIrrelevantExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/IrrelevantExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/IrrelevantExtension.kt"); doTest(fileName); } @TestMetadata("JavaTypeExtension.kt") public void testJavaTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt"); doTest(fileName); } @TestMetadata("KotlinGenericTypeExtension.kt") public void testKotlinGenericTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt"); doTest(fileName); } @TestMetadata("KotlinTypeExtension.kt") public void testKotlinTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinTypeExtension.kt"); doTest(fileName); } @TestMetadata("MemberExtensionFromWith.kt") public void testMemberExtensionFromWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionFromWith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionFromWith.kt"); doTest(fileName); } @TestMetadata("MemberExtensionWithoutExplicitReceiver.kt") public void testMemberExtensionWithoutExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionWithoutExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionWithoutExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("MemberExtensionsFromMemberExtension.kt") public void testMemberExtensionsFromMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionsFromMemberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionsFromMemberExtension.kt"); doTest(fileName); } @TestMetadata("NoDuplicatedMethodForSmartCast.kt") public void testNoDuplicatedMethodForSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt"); doTest(fileName); } @TestMetadata("NoExtensionFromOuter.kt") public void testNoExtensionFromOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoExtensionFromOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoExtensionFromOuter.kt"); doTest(fileName); } @TestMetadata("NoMemberExtensionsFromCompanionObject.kt") public void testNoMemberExtensionsFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoMemberExtensionsFromCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoMemberExtensionsFromCompanionObject.kt"); doTest(fileName); } @TestMetadata("StarTypeArg.kt") public void testStarTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt"); doTest(fileName); } @TestMetadata("WrongExplicitReceiver.kt") public void testWrongExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("WrongImplicitReceiver.kt") public void testWrongImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongImplicitReceiver.kt"); doTest(fileName); } } @@ -1324,47 +1324,47 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes public static class FromSmart extends AbstractJSBasicCompletionTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAs.kt"); doTest(fileName); } @TestMetadata("AfterAsNoDuplicates.kt") public void testAfterAsNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAsNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAsNoDuplicates.kt"); doTest(fileName); } public void testAllFilesPresentInFromSmart() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/fromSmart"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/fromSmart"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/EnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/EnumEntries.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods.kt") public void testJavaStaticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods2.kt") public void testJavaStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods2.kt"); doTest(fileName); } @TestMetadata("MultipleArgs.kt") public void testMultipleArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt"); doTest(fileName); } @TestMetadata("WhenByEnum.kt") public void testWhenByEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt"); doTest(fileName); } } @@ -1374,60 +1374,60 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class HighOrderFunctions extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInHighOrderFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ContextVariables1.kt") public void testContextVariables1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables1.kt"); doTest(fileName); } @TestMetadata("ContextVariables2.kt") public void testContextVariables2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables2.kt"); doTest(fileName); } @TestMetadata("ContextVariables3.kt") public void testContextVariables3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables3.kt"); doTest(fileName); } @TestMetadata("ContextVariablesFilter.kt") public void testContextVariablesFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt"); doTest(fileName); } @TestMetadata("ContextVariablesMap.kt") public void testContextVariablesMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt"); doTest(fileName); } @TestMetadata("ContextVariablesShadowing.kt") public void testContextVariablesShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesShadowing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesShadowing.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction1.kt") public void testHigherOrderFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction1.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction2.kt") public void testHigherOrderFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction2.kt"); doTest(fileName); } @TestMetadata("OptionalParameters.kt") public void testOptionalParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/OptionalParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/OptionalParameters.kt"); doTest(fileName); } } @@ -1437,66 +1437,66 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class LambdaSignature extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInLambdaSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ParameterName1.kt") public void testParameterName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt"); doTest(fileName); } @TestMetadata("ParameterName2.kt") public void testParameterName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName2.kt"); doTest(fileName); } @TestMetadata("ParameterName3.kt") public void testParameterName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt"); doTest(fileName); } @TestMetadata("ParameterName4.kt") public void testParameterName4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt"); doTest(fileName); } @TestMetadata("ParameterName5.kt") public void testParameterName5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt"); doTest(fileName); } @TestMetadata("ParameterType1.kt") public void testParameterType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt"); doTest(fileName); } @TestMetadata("ParameterType2.kt") public void testParameterType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt"); doTest(fileName); } @TestMetadata("ParameterType3.kt") public void testParameterType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt"); doTest(fileName); } @TestMetadata("ParameterType4.kt") public void testParameterType4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt"); doTest(fileName); } @TestMetadata("ParameterType5.kt") public void testParameterType5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt"); doTest(fileName); } } @@ -1507,107 +1507,107 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes public static class NamedArguments extends AbstractJSBasicCompletionTest { @TestMetadata("AfterBrace.kt") public void testAfterBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterBrace.kt"); doTest(fileName); } @TestMetadata("AfterComma.kt") public void testAfterComma() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterComma.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterComma.kt"); doTest(fileName); } @TestMetadata("AfterVararg.kt") public void testAfterVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterVararg.kt"); doTest(fileName); } public void testAllFilesPresentInNamedArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CompactTypeNames.kt") public void testCompactTypeNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/CompactTypeNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/CompactTypeNames.kt"); doTest(fileName); } @TestMetadata("ForEmptyParametersFunction.kt") public void testForEmptyParametersFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/ForEmptyParametersFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/ForEmptyParametersFunction.kt"); doTest(fileName); } @TestMetadata("InParameterExpression.kt") public void testInParameterExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/InParameterExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/InParameterExpression.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsFromOverloads.kt") public void testNamedArgumentsFromOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsFromOverloads2.kt") public void testNamedArgumentsFromOverloads2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads2.kt"); doTest(fileName); } @TestMetadata("NoAlreadyUsedParameters.kt") public void testNoAlreadyUsedParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoAlreadyUsedParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoAlreadyUsedParameters.kt"); doTest(fileName); } @TestMetadata("NoParamsFromUnapplicableOverload.kt") public void testNoParamsFromUnapplicableOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoParamsFromUnapplicableOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoParamsFromUnapplicableOverload.kt"); doTest(fileName); } @TestMetadata("NotInBrackets.kt") public void testNotInBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInBrackets.kt"); doTest(fileName); } @TestMetadata("NotInElse.kt") public void testNotInElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt"); doTest(fileName); } @TestMetadata("NotOnlyNamedArguments.kt") public void testNotOnlyNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt"); doTest(fileName); } @TestMetadata("NotOnlyNamedArguments2.kt") public void testNotOnlyNamedArguments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments2.kt"); doTest(fileName); } @TestMetadata("OfConstructor.kt") public void testOfConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OfConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OfConstructor.kt"); doTest(fileName); } @TestMetadata("OnlyNamedArguments.kt") public void testOnlyNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OnlyNamedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OnlyNamedArguments.kt"); doTest(fileName); } @TestMetadata("WithParameterExpression.kt") public void testWithParameterExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/WithParameterExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/WithParameterExpression.kt"); doTest(fileName); } } @@ -1617,48 +1617,48 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class NoCompletion extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInNoCompletion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/noCompletion"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/noCompletion"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoNotCompleteForErrorReceivers.kt") public void testDoNotCompleteForErrorReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceivers.kt"); doTest(fileName); } @TestMetadata("DoNotCompleteForErrorReceiversForce.kt") public void testDoNotCompleteForErrorReceiversForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceiversForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceiversForce.kt"); doTest(fileName); } @TestMetadata("InPackageBegin.kt") public void testInPackageBegin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/InPackageBegin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/InPackageBegin.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterBigFloat.kt") public void testNoCompletionAfterBigFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterBigFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterBigFloat.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterFloat.kt") public void testNoCompletionAfterFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterFloat.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterInt.kt") public void testNoCompletionAfterInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterInt.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterLong.kt") public void testNoCompletionAfterLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterLong.kt"); doTest(fileName); } } @@ -1668,48 +1668,48 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/override"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/override"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Generics.kt"); doTest(fileName); } @TestMetadata("InConstructorParameters.kt") public void testInConstructorParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt"); doTest(fileName); } @TestMetadata("InConstructorParameters2.kt") public void testInConstructorParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters2.kt"); doTest(fileName); } @TestMetadata("PreferImplementToOverride.kt") public void testPreferImplementToOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/PreferImplementToOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/PreferImplementToOverride.kt"); doTest(fileName); } @TestMetadata("SecondConstructorParameter.kt") public void testSecondConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/SecondConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/SecondConstructorParameter.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Simple.kt"); doTest(fileName); } @TestMetadata("TypeFunctionName.kt") public void testTypeFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/TypeFunctionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/TypeFunctionName.kt"); doTest(fileName); } } @@ -1719,168 +1719,168 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class ParameterNameAndType extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInParameterNameAndType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ByAbbreviation.kt") public void testByAbbreviation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt"); doTest(fileName); } @TestMetadata("NoAutoInsertion.kt") public void testNoAutoInsertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt"); doTest(fileName); } @TestMetadata("NoDuplication.kt") public void testNoDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); doTest(fileName); } @TestMetadata("NoDuplicationJava.kt") public void testNoDuplicationJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt"); doTest(fileName); } @TestMetadata("NoFromFileAndFromClassesDuplication.kt") public void testNoFromFileAndFromClassesDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt"); doTest(fileName); } @TestMetadata("NotForAnnnotationTypeConstructor.kt") public void testNotForAnnnotationTypeConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnnnotationTypeConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnnnotationTypeConstructor.kt"); doTest(fileName); } @TestMetadata("NotForAnonymousFunction.kt") public void testNotForAnonymousFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt"); doTest(fileName); } @TestMetadata("NotForCatchParameter.kt") public void testNotForCatchParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter1.kt") public void testNotForLambdaParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter2.kt") public void testNotForLambdaParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter2.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter3.kt") public void testNotForLambdaParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter3.kt"); doTest(fileName); } @TestMetadata("NotForSetterParameter.kt") public void testNotForSetterParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt"); doTest(fileName); } @TestMetadata("NotImported.kt") public void testNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt"); doTest(fileName); } @TestMetadata("NotImportedJava.kt") public void testNotImportedJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt"); doTest(fileName); } @TestMetadata("ParametersInFile.kt") public void testParametersInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt"); doTest(fileName); } @TestMetadata("ParametersInFileInaccessibleType.kt") public void testParametersInFileInaccessibleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt"); doTest(fileName); } @TestMetadata("ParametersInFileInaccessibleType2.kt") public void testParametersInFileInaccessibleType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter1.kt") public void testParametersInFileTypeParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter2.kt") public void testParametersInFileTypeParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter2.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter3.kt") public void testParametersInFileTypeParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt"); doTest(fileName); } @TestMetadata("URLConnection.kt") public void testURLConnection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt"); doTest(fileName); } @TestMetadata("UserPrefix1.kt") public void testUserPrefix1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt"); doTest(fileName); } @TestMetadata("UserPrefix2.kt") public void testUserPrefix2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt"); doTest(fileName); } @TestMetadata("UserPrefix3.kt") public void testUserPrefix3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt"); doTest(fileName); } @TestMetadata("ValParameter.kt") public void testValParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt"); doTest(fileName); } @TestMetadata("VarParameter.kt") public void testVarParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt"); doTest(fileName); } } @@ -1890,120 +1890,120 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Shadowing extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInShadowing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InInitializer1.kt") public void testInInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt"); doTest(fileName); } @TestMetadata("InInitializer2.kt") public void testInInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer2.kt"); doTest(fileName); } @TestMetadata("InInitializer3.kt") public void testInInitializer3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer3.kt"); doTest(fileName); } @TestMetadata("InInitializer4.kt") public void testInInitializer4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer4.kt"); doTest(fileName); } @TestMetadata("InInitializer5.kt") public void testInInitializer5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer5.kt"); doTest(fileName); } @TestMetadata("InInitializer6.kt") public void testInInitializer6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer6.kt"); doTest(fileName); } @TestMetadata("InInitializer7.kt") public void testInInitializer7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer7.kt"); doTest(fileName); } @TestMetadata("Locals1.kt") public void testLocals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals1.kt"); doTest(fileName); } @TestMetadata("Locals2.kt") public void testLocals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals2.kt"); doTest(fileName); } @TestMetadata("Overloads.kt") public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Overloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Overloads.kt"); doTest(fileName); } @TestMetadata("OverloadsAndVararg.kt") public void testOverloadsAndVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/OverloadsAndVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/OverloadsAndVararg.kt"); doTest(fileName); } @TestMetadata("PreferCloserMember.kt") public void testPreferCloserMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserMember.kt"); doTest(fileName); } @TestMetadata("PreferCloserReceiverGeneric.kt") public void testPreferCloserReceiverGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt"); doTest(fileName); } @TestMetadata("PreferMemberExtension.kt") public void testPreferMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberExtension.kt"); doTest(fileName); } @TestMetadata("PreferMemberToExtension.kt") public void testPreferMemberToExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToExtension.kt"); doTest(fileName); } @TestMetadata("PreferMemberToGlobal.kt") public void testPreferMemberToGlobal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToGlobal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToGlobal.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtension.kt") public void testPreferMoreSpecificExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtension.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtensionGeneric.kt") public void testPreferMoreSpecificExtensionGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtensionGenericWithParam.kt") public void testPreferMoreSpecificExtensionGenericWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt"); doTest(fileName); } } @@ -2013,48 +2013,48 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class SmartCast extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInSmartCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/smartCast"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/smartCast"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MemberExtensionAfterThisSmartCast.kt") public void testMemberExtensionAfterThisSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MemberExtensionAfterThisSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MemberExtensionAfterThisSmartCast.kt"); doTest(fileName); } @TestMetadata("MembersAfterSmartCast.kt") public void testMembersAfterSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MembersAfterSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MembersAfterSmartCast.kt"); doTest(fileName); } @TestMetadata("SmartCastAfterIf.kt") public void testSmartCastAfterIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIf.kt"); doTest(fileName); } @TestMetadata("SmartCastAfterIfMethod.kt") public void testSmartCastAfterIfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIfMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIfMethod.kt"); doTest(fileName); } @TestMetadata("SmartCastForThis.kt") public void testSmartCastForThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastForThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastForThis.kt"); doTest(fileName); } @TestMetadata("SmartCastInWhen.kt") public void testSmartCastInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastInWhen.kt"); doTest(fileName); } @TestMetadata("SmartCastThis.kt") public void testSmartCastThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastThis.kt"); doTest(fileName); } } @@ -2064,42 +2064,42 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class SubstitutedSignature extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInSubstitutedSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/substitutedSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/substitutedSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("SubstitutedSignature1.kt") public void testSubstitutedSignature1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature2.kt") public void testSubstitutedSignature2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature2.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature3.kt") public void testSubstitutedSignature3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature4.kt") public void testSubstitutedSignature4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature4.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature5.kt") public void testSubstitutedSignature5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature5.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature6.kt") public void testSubstitutedSignature6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature6.kt"); doTest(fileName); } } @@ -2109,60 +2109,60 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Super extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/super"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("QualifierType1.kt") public void testQualifierType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType1.kt"); doTest(fileName); } @TestMetadata("QualifierType2.kt") public void testQualifierType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType2.kt"); doTest(fileName); } @TestMetadata("QualifierType3.kt") public void testQualifierType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType3.kt"); doTest(fileName); } @TestMetadata("QualifierType4.kt") public void testQualifierType4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType4.kt"); doTest(fileName); } @TestMetadata("QualifierType5.kt") public void testQualifierType5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType5.kt"); doTest(fileName); } @TestMetadata("QualifierType6.kt") public void testQualifierType6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType6.kt"); doTest(fileName); } @TestMetadata("QualifierTypeAny.kt") public void testQualifierTypeAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAny.kt"); doTest(fileName); } @TestMetadata("QualifierTypeAnyInInterface.kt") public void testQualifierTypeAnyInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAnyInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAnyInInterface.kt"); doTest(fileName); } @TestMetadata("QualifierTypeGeneric.kt") public void testQualifierTypeGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeGeneric.kt"); doTest(fileName); } } @@ -2172,60 +2172,60 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeArgsOrNot extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInTypeArgsOrNot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/typeArgsOrNot"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/typeArgsOrNot"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorTypeArg.kt") public void testConstructorTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt"); doTest(fileName); } @TestMetadata("FunctionTypeArg.kt") public void testFunctionTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt"); doTest(fileName); } @TestMetadata("FunctionTypeArg2.kt") public void testFunctionTypeArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt"); doTest(fileName); } @TestMetadata("LessThan.kt") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt"); doTest(fileName); } @TestMetadata("NestedTypeArg.kt") public void testNestedTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg.kt") public void testSecondTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg2.kt") public void testSecondTypeArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg3.kt") public void testSecondTypeArg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg3.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg4.kt") public void testSecondTypeArg4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg4.kt"); doTest(fileName); } } @@ -2235,78 +2235,78 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("VisibilityClassMembersFromExternal.kt") public void testVisibilityClassMembersFromExternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternal.kt"); doTest(fileName); } @TestMetadata("VisibilityClassMembersFromExternalForce.kt") public void testVisibilityClassMembersFromExternalForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternalForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternalForce.kt"); doTest(fileName); } @TestMetadata("VisibilityInSubclass.kt") public void testVisibilityInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclass.kt"); doTest(fileName); } @TestMetadata("VisibilityInSubclassForce.kt") public void testVisibilityInSubclassForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclassForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclassForce.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThis.kt") public void testVisibilityPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInConstructor.kt") public void testVisibilityPrivateToThisInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructor.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInConstructorWithThis.kt") public void testVisibilityPrivateToThisInConstructorWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructorWithThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructorWithThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInSpecialScope.kt") public void testVisibilityPrivateToThisInSpecialScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInSpecialScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInSpecialScope.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithReceiver.kt") public void testVisibilityPrivateToThisWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithReceiver2.kt") public void testVisibilityPrivateToThisWithReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver2.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithThis.kt") public void testVisibilityPrivateToThisWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithWrongThis.kt") public void testVisibilityPrivateToThisWithWrongThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithWrongThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithWrongThis.kt"); doTest(fileName); } } @@ -2317,30 +2317,30 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @RunWith(JUnit3RunnerWithInners.class) public static class Js extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/js"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/js"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoForceCompletion.kt") public void testAutoForceCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/AutoForceCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/AutoForceCompletion.kt"); doTest(fileName); } @TestMetadata("DynamicKeyword.kt") public void testDynamicKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/DynamicKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/DynamicKeyword.kt"); doTest(fileName); } @TestMetadata("InPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/InPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/InPackage.kt"); doTest(fileName); } @TestMetadata("JSStd.kt") public void testJSStd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/JSStd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/js/JSStd.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index a0c0129552f..177ce3c7442 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -35,719 +35,719 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT public static class Common extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") public void testAfterFloatOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterFloatOnNewLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterFloatOnNewLine.kt"); doTest(fileName); } @TestMetadata("AfterIntSeparatedWithComments.kt") public void testAfterIntSeparatedWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterIntSeparatedWithComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/AfterIntSeparatedWithComments.kt"); doTest(fileName); } public void testAllFilesPresentInCommon() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("BasicAny.kt") public void testBasicAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicAny.kt"); doTest(fileName); } @TestMetadata("BasicInt.kt") public void testBasicInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BasicInt.kt"); doTest(fileName); } @TestMetadata("BeforeDotInCall.kt") public void testBeforeDotInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BeforeDotInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/BeforeDotInCall.kt"); doTest(fileName); } @TestMetadata("CallLocalLambda.kt") public void testCallLocalLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CallLocalLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CallLocalLambda.kt"); doTest(fileName); } @TestMetadata("classObjectElementsInClass.kt") public void testClassObjectElementsInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/classObjectElementsInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/classObjectElementsInClass.kt"); doTest(fileName); } @TestMetadata("ClassRedeclaration1.kt") public void testClassRedeclaration1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration1.kt"); doTest(fileName); } @TestMetadata("ClassRedeclaration2.kt") public void testClassRedeclaration2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ClassRedeclaration2.kt"); doTest(fileName); } @TestMetadata("CompletionInSetter.kt") public void testCompletionInSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CompletionInSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/CompletionInSetter.kt"); doTest(fileName); } @TestMetadata("ExtendClassName.kt") public void testExtendClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendClassName.kt"); doTest(fileName); } @TestMetadata("ExtendQualifiedClassName.kt") public void testExtendQualifiedClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendQualifiedClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtendQualifiedClassName.kt"); doTest(fileName); } @TestMetadata("ExtensionForProperty.kt") public void testExtensionForProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionForProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionForProperty.kt"); doTest(fileName); } @TestMetadata("ExtensionFunReceiver.kt") public void testExtensionFunReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionFunReceiverForce.kt") public void testExtensionFunReceiverForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiverForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunReceiverForce.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctionInClassObject.kt") public void testExtensionFunctionInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunctionInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionFunctionInClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionInsideFunction.kt") public void testExtensionInsideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionInsideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionInsideFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionToIntInFloatStyle.kt") public void testExtensionToIntInFloatStyle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionToIntInFloatStyle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionToIntInFloatStyle.kt"); doTest(fileName); } @TestMetadata("ExtensionWithAdditionalTypeParameters.kt") public void testExtensionWithAdditionalTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithAdditionalTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithAdditionalTypeParameters.kt"); doTest(fileName); } @TestMetadata("ExtensionWithGenericParamInReceiver.kt") public void testExtensionWithGenericParamInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericParamInReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionWithGenericReceiver.kt") public void testExtensionWithGenericReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithGenericReceiver.kt"); doTest(fileName); } @TestMetadata("ExtensionWithInternalGenericParameters.kt") public void testExtensionWithInternalGenericParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithInternalGenericParameters.kt"); doTest(fileName); } @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt") public void testExtensionWithManyTypeParamsInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ExtensionWithManyTypeParamsInReceiver.kt"); doTest(fileName); } @TestMetadata("FromImports.kt") public void testFromImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FromImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FromImports.kt"); doTest(fileName); } @TestMetadata("FunctionCompletionFormatting.kt") public void testFunctionCompletionFormatting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionCompletionFormatting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionCompletionFormatting.kt"); doTest(fileName); } @TestMetadata("FunctionVariableCallArgument.kt") public void testFunctionVariableCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionVariableCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/FunctionVariableCallArgument.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunReceiver1.kt") public void testGenericExtensionFunReceiver1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver1.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunReceiver2.kt") public void testGenericExtensionFunReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericExtensionFunReceiver2.kt"); doTest(fileName); } @TestMetadata("GenericKotlinClass.kt") public void testGenericKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericKotlinClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GenericKotlinClass.kt"); doTest(fileName); } @TestMetadata("GetPrefixForProperties.kt") public void testGetPrefixForProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GetPrefixForProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/GetPrefixForProperties.kt"); doTest(fileName); } @TestMetadata("ImportedEnumMembers.kt") public void testImportedEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedEnumMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedEnumMembers.kt"); doTest(fileName); } @TestMetadata("ImportedMemberFromObject.kt") public void testImportedMemberFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedMemberFromObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ImportedMemberFromObject.kt"); doTest(fileName); } @TestMetadata("InCallExpression.kt") public void testInCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InCallExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InCallExpression.kt"); doTest(fileName); } @TestMetadata("InClassInitializer.kt") public void testInClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassInitializer.kt"); doTest(fileName); } @TestMetadata("InClassObject.kt") public void testInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassObject.kt"); doTest(fileName); } @TestMetadata("InClassPropertyAccessor.kt") public void testInClassPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InClassPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InEmptyImport.kt") public void testInEmptyImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyImport.kt"); doTest(fileName); } @TestMetadata("InEmptyPackage.kt") public void testInEmptyPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InEmptyPackage.kt"); doTest(fileName); } @TestMetadata("InExpressionNoPrefix.kt") public void testInExpressionNoPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExpressionNoPrefix.kt"); doTest(fileName); } @TestMetadata("InExtendTypeAnnotation.kt") public void testInExtendTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InExtendTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("InFileWithMultiDeclaration.kt") public void testInFileWithMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithMultiDeclaration.kt"); doTest(fileName); } @TestMetadata("InFileWithTypedef.kt") public void testInFileWithTypedef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithTypedef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFileWithTypedef.kt"); doTest(fileName); } @TestMetadata("InFunInClassInitializer.kt") public void testInFunInClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunInClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunInClassInitializer.kt"); doTest(fileName); } @TestMetadata("InFunctionArguments.kt") public void testInFunctionArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunctionArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InFunctionArguments.kt"); doTest(fileName); } @TestMetadata("InGlobalPropertyInitializer.kt") public void testInGlobalPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InGlobalPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InGlobalPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("InImport.kt") public void testInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InImport.kt"); doTest(fileName); } @TestMetadata("InInitializerInPropertyAccessor.kt") public void testInInitializerInPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInitializerInPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInitializerInPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InInnerClass.kt") public void testInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InInnerClass.kt"); doTest(fileName); } @TestMetadata("InLambda.kt") public void testInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLambda.kt"); doTest(fileName); } @TestMetadata("InLocalObjectDeclaration.kt") public void testInLocalObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLocalObjectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLocalObjectDeclaration.kt"); doTest(fileName); } @TestMetadata("InLongDotQualifiedExpression.kt") public void testInLongDotQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLongDotQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InLongDotQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("InMiddleOfPackage.kt") public void testInMiddleOfPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackage.kt"); doTest(fileName); } @TestMetadata("InMiddleOfPackageDirective.kt") public void testInMiddleOfPackageDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackageDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InMiddleOfPackageDirective.kt"); doTest(fileName); } @TestMetadata("InNestedClass.kt") public void testInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InNestedClass.kt"); doTest(fileName); } @TestMetadata("InObjectInDelegationSpecifier.kt") public void testInObjectInDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InObjectInDelegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InObjectInDelegationSpecifier.kt"); doTest(fileName); } @TestMetadata("InPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPackage.kt"); doTest(fileName); } @TestMetadata("InParametersTypes.kt") public void testInParametersTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypes.kt"); doTest(fileName); } @TestMetadata("InParametersTypesForce.kt") public void testInParametersTypesForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypesForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InParametersTypesForce.kt"); doTest(fileName); } @TestMetadata("InPropertyAccessor.kt") public void testInPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InPropertyInitializer.kt") public void testInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorBody.kt") public void testInSecondaryConstructorBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorBody.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorDefaultParameter.kt") public void testInSecondaryConstructorDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDefaultParameter.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorDelegationCall.kt") public void testInSecondaryConstructorDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorDelegationCall.kt"); doTest(fileName); } @TestMetadata("InSecondaryConstructorFirstDefaultParameter.kt") public void testInSecondaryConstructorFirstDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorFirstDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InSecondaryConstructorFirstDefaultParameter.kt"); doTest(fileName); } @TestMetadata("InTypeAnnotation.kt") public void testInTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("InfixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCall.kt"); doTest(fileName); } @TestMetadata("InfixCallNoSpecialLambdaArgumentItem.kt") public void testInfixCallNoSpecialLambdaArgumentItem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InnerClass.kt"); doTest(fileName); } @TestMetadata("InsideAnonymousClass.kt") public void testInsideAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InsideAnonymousClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InsideAnonymousClass.kt"); doTest(fileName); } @TestMetadata("InterfaceNameBeforeRunBug.kt") public void testInterfaceNameBeforeRunBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InterfaceNameBeforeRunBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/InterfaceNameBeforeRunBug.kt"); doTest(fileName); } @TestMetadata("JavaPackage.kt") public void testJavaPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/JavaPackage.kt"); doTest(fileName); } @TestMetadata("LocalMultideclarationValues.kt") public void testLocalMultideclarationValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/LocalMultideclarationValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/LocalMultideclarationValues.kt"); doTest(fileName); } @TestMetadata("NameWithDollars.kt") public void testNameWithDollars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NameWithDollars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NameWithDollars.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NamedObject.kt"); doTest(fileName); } @TestMetadata("NestedBuiltInClass.kt") public void testNestedBuiltInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedBuiltInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedBuiltInClass.kt"); doTest(fileName); } @TestMetadata("NestedClassBug.kt") public void testNestedClassBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassBug.kt"); doTest(fileName); } @TestMetadata("NestedClassNameForExtension.kt") public void testNestedClassNameForExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension.kt"); doTest(fileName); } @TestMetadata("NestedClassNameForExtension2.kt") public void testNestedClassNameForExtension2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassNameForExtension2.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnClassWithDefaultObject.kt") public void testNestedClassesOnClassWithDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithDefaultObject.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnClassWithNamedDefaultObject.kt") public void testNestedClassesOnClassWithNamedDefaultObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnClassWithNamedDefaultObject.kt"); doTest(fileName); } @TestMetadata("NestedClassesOnDefaultObjectLiteral.kt") public void testNestedClassesOnDefaultObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnDefaultObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NestedClassesOnDefaultObjectLiteral.kt"); doTest(fileName); } @TestMetadata("NoAutoInsertionOfNotImported.kt") public void testNoAutoInsertionOfNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoAutoInsertionOfNotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoAutoInsertionOfNotImported.kt"); doTest(fileName); } @TestMetadata("NoClassNameDuplication.kt") public void testNoClassNameDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoClassNameDuplication.kt"); doTest(fileName); } @TestMetadata("NoEmptyPackage.kt") public void testNoEmptyPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEmptyPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEmptyPackage.kt"); doTest(fileName); } @TestMetadata("NoEnumEntryType.kt") public void testNoEnumEntryType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumEntryType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumEntryType.kt"); doTest(fileName); } @TestMetadata("NoEnumMembersFromImplicitQualifier.kt") public void testNoEnumMembersFromImplicitQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumMembersFromImplicitQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoEnumMembersFromImplicitQualifier.kt"); doTest(fileName); } @TestMetadata("NoExtensionsAfterQualifier.kt") public void testNoExtensionsAfterQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoExtensionsAfterQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoExtensionsAfterQualifier.kt"); doTest(fileName); } @TestMetadata("NoLocalsDeclaredAhead.kt") public void testNoLocalsDeclaredAhead() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoLocalsDeclaredAhead.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoLocalsDeclaredAhead.kt"); doTest(fileName); } @TestMetadata("NoNestedClassAfterReceiver.kt") public void testNoNestedClassAfterReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassAfterReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassAfterReceiver.kt"); doTest(fileName); } @TestMetadata("NoNestedClassesFromImplicitQualifier.kt") public void testNoNestedClassesFromImplicitQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassesFromImplicitQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoNestedClassesFromImplicitQualifier.kt"); doTest(fileName); } @TestMetadata("NoPackageFacadeClasses.kt") public void testNoPackageFacadeClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoPackageFacadeClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoPackageFacadeClasses.kt"); doTest(fileName); } @TestMetadata("NoParameterAnnotationInPresentation.kt") public void testNoParameterAnnotationInPresentation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoParameterAnnotationInPresentation.kt"); doTest(fileName); } @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt") public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt"); doTest(fileName); } @TestMetadata("ObjectInTypePosition.kt") public void testObjectInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectInTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectInTypePosition.kt"); doTest(fileName); } @TestMetadata("ObjectMembersFromNested.kt") public void testObjectMembersFromNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectMembersFromNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectMembersFromNested.kt"); doTest(fileName); } @TestMetadata("ObjectRedeclaration1.kt") public void testObjectRedeclaration1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration1.kt"); doTest(fileName); } @TestMetadata("ObjectRedeclaration2.kt") public void testObjectRedeclaration2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ObjectRedeclaration2.kt"); doTest(fileName); } @TestMetadata("OverloadFunctions.kt") public void testOverloadFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/OverloadFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/OverloadFunctions.kt"); doTest(fileName); } @TestMetadata("PrivatesInSecondPressCompletion.kt") public void testPrivatesInSecondPressCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/PrivatesInSecondPressCompletion.kt"); doTest(fileName); } @TestMetadata("RecieverMembersFromExtAccessor.kt") public void testRecieverMembersFromExtAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtAccessor.kt"); doTest(fileName); } @TestMetadata("RecieverMembersFromExtFun.kt") public void testRecieverMembersFromExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/RecieverMembersFromExtFun.kt"); doTest(fileName); } @TestMetadata("SetPrefixForProperties.kt") public void testSetPrefixForProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SetPrefixForProperties.kt"); doTest(fileName); } @TestMetadata("ShortClassNamesInTypePosition.kt") public void testShortClassNamesInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ShortClassNamesInTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/ShortClassNamesInTypePosition.kt"); doTest(fileName); } @TestMetadata("StandardJetArrayFirst.kt") public void testStandardJetArrayFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt"); doTest(fileName); } @TestMetadata("StandardJetDoubleFirst.kt") public void testStandardJetDoubleFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt"); doTest(fileName); } @TestMetadata("StringTemplate1.kt") public void testStringTemplate1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate1.kt"); doTest(fileName); } @TestMetadata("StringTemplate2.kt") public void testStringTemplate2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/StringTemplate2.kt"); doTest(fileName); } @TestMetadata("SubpackageInFun.kt") public void testSubpackageInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SubpackageInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/SubpackageInFun.kt"); doTest(fileName); } @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt") public void testTopLevelClassCompletionInQualifiedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassCompletionInQualifiedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassCompletionInQualifiedCall.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName1.kt") public void testTopLevelClassName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName1.kt"); doTest(fileName); } @TestMetadata("topLevelClassName2.kt") public void testTopLevelClassName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/topLevelClassName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/topLevelClassName2.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName4.kt") public void testTopLevelClassName4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName4.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName5.kt") public void testTopLevelClassName5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName5.kt"); doTest(fileName); } @TestMetadata("TopLevelClassName-3.kt") public void testTopLevelClassName_3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt"); doTest(fileName); } @TestMetadata("TypeArgCompletionBug.kt") public void testTypeArgCompletionBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgCompletionBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgCompletionBug.kt"); doTest(fileName); } @TestMetadata("TypeArgFromTheSameFile.kt") public void testTypeArgFromTheSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgFromTheSameFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgFromTheSameFile.kt"); doTest(fileName); } @TestMetadata("TypeArgOfOwnerClass.kt") public void testTypeArgOfOwnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgOfOwnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeArgOfOwnerClass.kt"); doTest(fileName); } @TestMetadata("TypeParameterFromOuterClass.kt") public void testTypeParameterFromOuterClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeParameterFromOuterClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TypeParameterFromOuterClass.kt"); doTest(fileName); } @TestMetadata("VariableClassName.kt") public void testVariableClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/VariableClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/VariableClassName.kt"); doTest(fileName); } @@ -756,174 +756,174 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Annotated.kt") public void testAnnotated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Annotated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Annotated.kt"); doTest(fileName); } @TestMetadata("AnnotationTarget.kt") public void testAnnotationTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/AnnotationTarget.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated.kt"); doTest(fileName); } @TestMetadata("Deprecated2.kt") public void testDeprecated2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/Deprecated2.kt"); doTest(fileName); } @TestMetadata("ForType.kt") public void testForType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ForType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ForType.kt"); doTest(fileName); } @TestMetadata("FunctionAnnotation1.kt") public void testFunctionAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation1.kt"); doTest(fileName); } @TestMetadata("FunctionAnnotation2.kt") public void testFunctionAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/FunctionAnnotation2.kt"); doTest(fileName); } @TestMetadata("NoCatchParameterAutopopup.kt") public void testNoCatchParameterAutopopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoCatchParameterAutopopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoCatchParameterAutopopup.kt"); doTest(fileName); } @TestMetadata("NoSetterParameterAutopopup.kt") public void testNoSetterParameterAutopopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoSetterParameterAutopopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/NoSetterParameterAutopopup.kt"); doTest(fileName); } @TestMetadata("OnlyAnnotations.kt") public void testOnlyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/OnlyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/OnlyAnnotations.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation1.kt") public void testParameterAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation1.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation2.kt") public void testParameterAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation2.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation3.kt") public void testParameterAnnotation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation3.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation4.kt") public void testParameterAnnotation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation4.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation5.kt") public void testParameterAnnotation5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation5.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation6.kt") public void testParameterAnnotation6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation6.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation7.kt") public void testParameterAnnotation7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation7.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation8.kt") public void testParameterAnnotation8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation8.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotation9.kt") public void testParameterAnnotation9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotation9.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationArgs.kt") public void testParameterAnnotationArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationArgs.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationAutoPopup1.kt") public void testParameterAnnotationAutoPopup1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup1.kt"); doTest(fileName); } @TestMetadata("ParameterAnnotationAutoPopup2.kt") public void testParameterAnnotationAutoPopup2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/ParameterAnnotationAutoPopup2.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation1.kt") public void testTopLevelAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation1.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation2.kt") public void testTopLevelAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation2.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation3.kt") public void testTopLevelAnnotation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation3.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotation4.kt") public void testTopLevelAnnotation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotation4.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotationArg1.kt") public void testTopLevelAnnotationArg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg1.kt"); doTest(fileName); } @TestMetadata("TopLevelAnnotationArg2.kt") public void testTopLevelAnnotationArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt"); doTest(fileName); } } @@ -933,90 +933,90 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class AutoPopup extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInAutoPopup() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/autoPopup"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/autoPopup"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutopopupInFunExtensionReceiver.kt") public void testAutopopupInFunExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/AutopopupInFunExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/AutopopupInFunExtensionReceiver.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunTypeArgument.kt") public void testGenericExtensionFunTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument.kt"); doTest(fileName); } @TestMetadata("GenericExtensionFunTypeArgument2.kt") public void testGenericExtensionFunTypeArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/GenericExtensionFunTypeArgument2.kt"); doTest(fileName); } @TestMetadata("NoAutoPopupAfterNumberLiteral.kt") public void testNoAutoPopupAfterNumberLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupAfterNumberLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupAfterNumberLiteral.kt"); doTest(fileName); } @TestMetadata("NoAutoPopupInValName.kt") public void testNoAutoPopupInValName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupInValName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutoPopupInValName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInExtFunName.kt") public void testNoAutopopupInExtFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInExtFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInExtFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInFunName.kt") public void testNoAutopopupInFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericExtFunName.kt") public void testNoAutopopupInGenericExtFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericExtFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericExtFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericFunName.kt") public void testNoAutopopupInGenericFunName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericFunName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericFunName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericValName.kt") public void testNoAutopopupInGenericValName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericValName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericValName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInGenericVarName.kt") public void testNoAutopopupInGenericVarName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericVarName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInGenericVarName.kt"); doTest(fileName); } @TestMetadata("NoAutopopupInVarName.kt") public void testNoAutopopupInVarName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInVarName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoAutopopupInVarName.kt"); doTest(fileName); } @TestMetadata("NoSecondPressCompletionInAutoPopup.kt") public void testNoSecondPressCompletionInAutoPopup() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoSecondPressCompletionInAutoPopup.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/NoSecondPressCompletionInAutoPopup.kt"); doTest(fileName); } @TestMetadata("OnlyScopedClassesWithoutExplicit.kt") public void testOnlyScopedClassesWithoutExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/OnlyScopedClassesWithoutExplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/autoPopup/OnlyScopedClassesWithoutExplicit.kt"); doTest(fileName); } } @@ -1027,107 +1027,107 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT public static class BoldOrGrayed extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterNullable.kt") public void testAfterNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullable.kt"); doTest(fileName); } @TestMetadata("AfterNullableAutoCast.kt") public void testAfterNullableAutoCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast.kt"); doTest(fileName); } @TestMetadata("AfterNullableAutoCast2.kt") public void testAfterNullableAutoCast2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/AfterNullableAutoCast2.kt"); doTest(fileName); } public void testAllFilesPresentInBoldOrGrayed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImmediateExtensionMembers1.kt") public void testImmediateExtensionMembers1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers1.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers2.kt") public void testImmediateExtensionMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers2.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers3.kt") public void testImmediateExtensionMembers3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers3.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers4.kt") public void testImmediateExtensionMembers4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembers4.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembersGeneric.kt") public void testImmediateExtensionMembersGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembersGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateExtensionMembersGeneric.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers1.kt") public void testImmediateMembers1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers1.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers2.kt") public void testImmediateMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers2.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers3.kt") public void testImmediateMembers3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers3.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers4.kt") public void testImmediateMembers4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers4.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers5.kt") public void testImmediateMembers5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/ImmediateMembers5.kt"); doTest(fileName); } @TestMetadata("InExtensionForNullable.kt") public void testInExtensionForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/InExtensionForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/InExtensionForNullable.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCast.kt") public void testNonPredictableSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCast.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCastWithWrongReturnType.kt") public void testNonPredictableSmartCastWithWrongReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCastWithWrongReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/NonPredictableSmartCastWithWrongReturnType.kt"); doTest(fileName); } @TestMetadata("SafeCallAfterNullable.kt") public void testSafeCallAfterNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt"); doTest(fileName); } } @@ -1137,36 +1137,36 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EmptyQualifier.kt") public void testEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifier.kt"); doTest(fileName); } @TestMetadata("EmptyQualifierInExtensionFun.kt") public void testEmptyQualifierInExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifierInExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/EmptyQualifierInExtensionFun.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction.kt") public void testHigherOrderFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/HigherOrderFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/HigherOrderFunction.kt"); doTest(fileName); } @TestMetadata("NonEmptyQualifier.kt") public void testNonEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/NonEmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/NonEmptyQualifier.kt"); doTest(fileName); } @TestMetadata("SyntheticExtensions.kt") public void testSyntheticExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/SyntheticExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/callableReference/SyntheticExtensions.kt"); doTest(fileName); } } @@ -1176,144 +1176,144 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Extensions extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ComplexCapture.kt") public void testComplexCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture.kt"); doTest(fileName); } @TestMetadata("ComplexCapture2.kt") public void testComplexCapture2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ComplexCapture2.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtendedClass.kt") public void testExtensionInExtendedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClass.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtendedClassThis.kt") public void testExtensionInExtendedClassThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClassThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtendedClassThis.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtension.kt") public void testExtensionInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtension.kt"); doTest(fileName); } @TestMetadata("ExtensionInExtensionThis.kt") public void testExtensionInExtensionThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtensionThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionInExtensionThis.kt"); doTest(fileName); } @TestMetadata("ExtensionOnFQObject.kt") public void testExtensionOnFQObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnFQObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnFQObject.kt"); doTest(fileName); } @TestMetadata("ExtensionOnNestedClassObject.kt") public void testExtensionOnNestedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnNestedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/ExtensionOnNestedClassObject.kt"); doTest(fileName); } @TestMetadata("Extensions.kt") public void testExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/Extensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/Extensions.kt"); doTest(fileName); } @TestMetadata("InvalidTypeParameters.kt") public void testInvalidTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/InvalidTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/InvalidTypeParameters.kt"); doTest(fileName); } @TestMetadata("IrrelevantExtension.kt") public void testIrrelevantExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/IrrelevantExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/IrrelevantExtension.kt"); doTest(fileName); } @TestMetadata("JavaTypeExtension.kt") public void testJavaTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/JavaTypeExtension.kt"); doTest(fileName); } @TestMetadata("KotlinGenericTypeExtension.kt") public void testKotlinGenericTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinGenericTypeExtension.kt"); doTest(fileName); } @TestMetadata("KotlinTypeExtension.kt") public void testKotlinTypeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinTypeExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/KotlinTypeExtension.kt"); doTest(fileName); } @TestMetadata("MemberExtensionFromWith.kt") public void testMemberExtensionFromWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionFromWith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionFromWith.kt"); doTest(fileName); } @TestMetadata("MemberExtensionWithoutExplicitReceiver.kt") public void testMemberExtensionWithoutExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionWithoutExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionWithoutExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("MemberExtensionsFromMemberExtension.kt") public void testMemberExtensionsFromMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionsFromMemberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/MemberExtensionsFromMemberExtension.kt"); doTest(fileName); } @TestMetadata("NoDuplicatedMethodForSmartCast.kt") public void testNoDuplicatedMethodForSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoDuplicatedMethodForSmartCast.kt"); doTest(fileName); } @TestMetadata("NoExtensionFromOuter.kt") public void testNoExtensionFromOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoExtensionFromOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoExtensionFromOuter.kt"); doTest(fileName); } @TestMetadata("NoMemberExtensionsFromCompanionObject.kt") public void testNoMemberExtensionsFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoMemberExtensionsFromCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/NoMemberExtensionsFromCompanionObject.kt"); doTest(fileName); } @TestMetadata("StarTypeArg.kt") public void testStarTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/StarTypeArg.kt"); doTest(fileName); } @TestMetadata("WrongExplicitReceiver.kt") public void testWrongExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongExplicitReceiver.kt"); doTest(fileName); } @TestMetadata("WrongImplicitReceiver.kt") public void testWrongImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/extensions/WrongImplicitReceiver.kt"); doTest(fileName); } } @@ -1324,47 +1324,47 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT public static class FromSmart extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAs.kt"); doTest(fileName); } @TestMetadata("AfterAsNoDuplicates.kt") public void testAfterAsNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAsNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/AfterAsNoDuplicates.kt"); doTest(fileName); } public void testAllFilesPresentInFromSmart() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/fromSmart"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/fromSmart"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/EnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/EnumEntries.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods.kt") public void testJavaStaticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods2.kt") public void testJavaStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/JavaStaticMethods2.kt"); doTest(fileName); } @TestMetadata("MultipleArgs.kt") public void testMultipleArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt"); doTest(fileName); } @TestMetadata("WhenByEnum.kt") public void testWhenByEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt"); doTest(fileName); } } @@ -1374,60 +1374,60 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class HighOrderFunctions extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInHighOrderFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ContextVariables1.kt") public void testContextVariables1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables1.kt"); doTest(fileName); } @TestMetadata("ContextVariables2.kt") public void testContextVariables2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables2.kt"); doTest(fileName); } @TestMetadata("ContextVariables3.kt") public void testContextVariables3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariables3.kt"); doTest(fileName); } @TestMetadata("ContextVariablesFilter.kt") public void testContextVariablesFilter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt"); doTest(fileName); } @TestMetadata("ContextVariablesMap.kt") public void testContextVariablesMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt"); doTest(fileName); } @TestMetadata("ContextVariablesShadowing.kt") public void testContextVariablesShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesShadowing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesShadowing.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction1.kt") public void testHigherOrderFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction1.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction2.kt") public void testHigherOrderFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/HigherOrderFunction2.kt"); doTest(fileName); } @TestMetadata("OptionalParameters.kt") public void testOptionalParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/OptionalParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/highOrderFunctions/OptionalParameters.kt"); doTest(fileName); } } @@ -1437,66 +1437,66 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class LambdaSignature extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInLambdaSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/lambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ParameterName1.kt") public void testParameterName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName1.kt"); doTest(fileName); } @TestMetadata("ParameterName2.kt") public void testParameterName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName2.kt"); doTest(fileName); } @TestMetadata("ParameterName3.kt") public void testParameterName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName3.kt"); doTest(fileName); } @TestMetadata("ParameterName4.kt") public void testParameterName4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName4.kt"); doTest(fileName); } @TestMetadata("ParameterName5.kt") public void testParameterName5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterName5.kt"); doTest(fileName); } @TestMetadata("ParameterType1.kt") public void testParameterType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType1.kt"); doTest(fileName); } @TestMetadata("ParameterType2.kt") public void testParameterType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType2.kt"); doTest(fileName); } @TestMetadata("ParameterType3.kt") public void testParameterType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType3.kt"); doTest(fileName); } @TestMetadata("ParameterType4.kt") public void testParameterType4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType4.kt"); doTest(fileName); } @TestMetadata("ParameterType5.kt") public void testParameterType5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/lambdaSignature/ParameterType5.kt"); doTest(fileName); } } @@ -1507,107 +1507,107 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT public static class NamedArguments extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterBrace.kt") public void testAfterBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterBrace.kt"); doTest(fileName); } @TestMetadata("AfterComma.kt") public void testAfterComma() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterComma.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterComma.kt"); doTest(fileName); } @TestMetadata("AfterVararg.kt") public void testAfterVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/AfterVararg.kt"); doTest(fileName); } public void testAllFilesPresentInNamedArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CompactTypeNames.kt") public void testCompactTypeNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/CompactTypeNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/CompactTypeNames.kt"); doTest(fileName); } @TestMetadata("ForEmptyParametersFunction.kt") public void testForEmptyParametersFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/ForEmptyParametersFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/ForEmptyParametersFunction.kt"); doTest(fileName); } @TestMetadata("InParameterExpression.kt") public void testInParameterExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/InParameterExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/InParameterExpression.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsFromOverloads.kt") public void testNamedArgumentsFromOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsFromOverloads2.kt") public void testNamedArgumentsFromOverloads2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NamedArgumentsFromOverloads2.kt"); doTest(fileName); } @TestMetadata("NoAlreadyUsedParameters.kt") public void testNoAlreadyUsedParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoAlreadyUsedParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoAlreadyUsedParameters.kt"); doTest(fileName); } @TestMetadata("NoParamsFromUnapplicableOverload.kt") public void testNoParamsFromUnapplicableOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoParamsFromUnapplicableOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NoParamsFromUnapplicableOverload.kt"); doTest(fileName); } @TestMetadata("NotInBrackets.kt") public void testNotInBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInBrackets.kt"); doTest(fileName); } @TestMetadata("NotInElse.kt") public void testNotInElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotInElse.kt"); doTest(fileName); } @TestMetadata("NotOnlyNamedArguments.kt") public void testNotOnlyNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments.kt"); doTest(fileName); } @TestMetadata("NotOnlyNamedArguments2.kt") public void testNotOnlyNamedArguments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/NotOnlyNamedArguments2.kt"); doTest(fileName); } @TestMetadata("OfConstructor.kt") public void testOfConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OfConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OfConstructor.kt"); doTest(fileName); } @TestMetadata("OnlyNamedArguments.kt") public void testOnlyNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OnlyNamedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/OnlyNamedArguments.kt"); doTest(fileName); } @TestMetadata("WithParameterExpression.kt") public void testWithParameterExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/WithParameterExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/namedArguments/WithParameterExpression.kt"); doTest(fileName); } } @@ -1617,48 +1617,48 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class NoCompletion extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInNoCompletion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/noCompletion"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/noCompletion"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoNotCompleteForErrorReceivers.kt") public void testDoNotCompleteForErrorReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceivers.kt"); doTest(fileName); } @TestMetadata("DoNotCompleteForErrorReceiversForce.kt") public void testDoNotCompleteForErrorReceiversForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceiversForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/DoNotCompleteForErrorReceiversForce.kt"); doTest(fileName); } @TestMetadata("InPackageBegin.kt") public void testInPackageBegin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/InPackageBegin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/InPackageBegin.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterBigFloat.kt") public void testNoCompletionAfterBigFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterBigFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterBigFloat.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterFloat.kt") public void testNoCompletionAfterFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterFloat.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterInt.kt") public void testNoCompletionAfterInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterInt.kt"); doTest(fileName); } @TestMetadata("NoCompletionAfterLong.kt") public void testNoCompletionAfterLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/noCompletion/NoCompletionAfterLong.kt"); doTest(fileName); } } @@ -1668,48 +1668,48 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/override"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/override"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Generics.kt"); doTest(fileName); } @TestMetadata("InConstructorParameters.kt") public void testInConstructorParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt"); doTest(fileName); } @TestMetadata("InConstructorParameters2.kt") public void testInConstructorParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/InConstructorParameters2.kt"); doTest(fileName); } @TestMetadata("PreferImplementToOverride.kt") public void testPreferImplementToOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/PreferImplementToOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/PreferImplementToOverride.kt"); doTest(fileName); } @TestMetadata("SecondConstructorParameter.kt") public void testSecondConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/SecondConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/SecondConstructorParameter.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/Simple.kt"); doTest(fileName); } @TestMetadata("TypeFunctionName.kt") public void testTypeFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/TypeFunctionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/override/TypeFunctionName.kt"); doTest(fileName); } } @@ -1719,168 +1719,168 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class ParameterNameAndType extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInParameterNameAndType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ByAbbreviation.kt") public void testByAbbreviation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt"); doTest(fileName); } @TestMetadata("NoAutoInsertion.kt") public void testNoAutoInsertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt"); doTest(fileName); } @TestMetadata("NoDuplication.kt") public void testNoDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplication.kt"); doTest(fileName); } @TestMetadata("NoDuplicationJava.kt") public void testNoDuplicationJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoDuplicationJava.kt"); doTest(fileName); } @TestMetadata("NoFromFileAndFromClassesDuplication.kt") public void testNoFromFileAndFromClassesDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NoFromFileAndFromClassesDuplication.kt"); doTest(fileName); } @TestMetadata("NotForAnnnotationTypeConstructor.kt") public void testNotForAnnnotationTypeConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnnnotationTypeConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnnnotationTypeConstructor.kt"); doTest(fileName); } @TestMetadata("NotForAnonymousFunction.kt") public void testNotForAnonymousFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt"); doTest(fileName); } @TestMetadata("NotForCatchParameter.kt") public void testNotForCatchParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter1.kt") public void testNotForLambdaParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter2.kt") public void testNotForLambdaParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter2.kt"); doTest(fileName); } @TestMetadata("NotForLambdaParameter3.kt") public void testNotForLambdaParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter3.kt"); doTest(fileName); } @TestMetadata("NotForSetterParameter.kt") public void testNotForSetterParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt"); doTest(fileName); } @TestMetadata("NotImported.kt") public void testNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt"); doTest(fileName); } @TestMetadata("NotImportedJava.kt") public void testNotImportedJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt"); doTest(fileName); } @TestMetadata("ParametersInFile.kt") public void testParametersInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt"); doTest(fileName); } @TestMetadata("ParametersInFileInaccessibleType.kt") public void testParametersInFileInaccessibleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt"); doTest(fileName); } @TestMetadata("ParametersInFileInaccessibleType2.kt") public void testParametersInFileInaccessibleType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter1.kt") public void testParametersInFileTypeParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter2.kt") public void testParametersInFileTypeParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter2.kt"); doTest(fileName); } @TestMetadata("ParametersInFileTypeParameter3.kt") public void testParametersInFileTypeParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt"); doTest(fileName); } @TestMetadata("URLConnection.kt") public void testURLConnection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt"); doTest(fileName); } @TestMetadata("UserPrefix1.kt") public void testUserPrefix1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt"); doTest(fileName); } @TestMetadata("UserPrefix2.kt") public void testUserPrefix2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt"); doTest(fileName); } @TestMetadata("UserPrefix3.kt") public void testUserPrefix3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt"); doTest(fileName); } @TestMetadata("ValParameter.kt") public void testValParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt"); doTest(fileName); } @TestMetadata("VarParameter.kt") public void testVarParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt"); doTest(fileName); } } @@ -1890,120 +1890,120 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Shadowing extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInShadowing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InInitializer1.kt") public void testInInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer1.kt"); doTest(fileName); } @TestMetadata("InInitializer2.kt") public void testInInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer2.kt"); doTest(fileName); } @TestMetadata("InInitializer3.kt") public void testInInitializer3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer3.kt"); doTest(fileName); } @TestMetadata("InInitializer4.kt") public void testInInitializer4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer4.kt"); doTest(fileName); } @TestMetadata("InInitializer5.kt") public void testInInitializer5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer5.kt"); doTest(fileName); } @TestMetadata("InInitializer6.kt") public void testInInitializer6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer6.kt"); doTest(fileName); } @TestMetadata("InInitializer7.kt") public void testInInitializer7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/InInitializer7.kt"); doTest(fileName); } @TestMetadata("Locals1.kt") public void testLocals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals1.kt"); doTest(fileName); } @TestMetadata("Locals2.kt") public void testLocals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Locals2.kt"); doTest(fileName); } @TestMetadata("Overloads.kt") public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Overloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/Overloads.kt"); doTest(fileName); } @TestMetadata("OverloadsAndVararg.kt") public void testOverloadsAndVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/OverloadsAndVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/OverloadsAndVararg.kt"); doTest(fileName); } @TestMetadata("PreferCloserMember.kt") public void testPreferCloserMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserMember.kt"); doTest(fileName); } @TestMetadata("PreferCloserReceiverGeneric.kt") public void testPreferCloserReceiverGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt"); doTest(fileName); } @TestMetadata("PreferMemberExtension.kt") public void testPreferMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberExtension.kt"); doTest(fileName); } @TestMetadata("PreferMemberToExtension.kt") public void testPreferMemberToExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToExtension.kt"); doTest(fileName); } @TestMetadata("PreferMemberToGlobal.kt") public void testPreferMemberToGlobal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToGlobal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMemberToGlobal.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtension.kt") public void testPreferMoreSpecificExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtension.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtensionGeneric.kt") public void testPreferMoreSpecificExtensionGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGeneric.kt"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtensionGenericWithParam.kt") public void testPreferMoreSpecificExtensionGenericWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/shadowing/PreferMoreSpecificExtensionGenericWithParam.kt"); doTest(fileName); } } @@ -2013,48 +2013,48 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class SmartCast extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInSmartCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/smartCast"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/smartCast"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MemberExtensionAfterThisSmartCast.kt") public void testMemberExtensionAfterThisSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MemberExtensionAfterThisSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MemberExtensionAfterThisSmartCast.kt"); doTest(fileName); } @TestMetadata("MembersAfterSmartCast.kt") public void testMembersAfterSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MembersAfterSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/MembersAfterSmartCast.kt"); doTest(fileName); } @TestMetadata("SmartCastAfterIf.kt") public void testSmartCastAfterIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIf.kt"); doTest(fileName); } @TestMetadata("SmartCastAfterIfMethod.kt") public void testSmartCastAfterIfMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIfMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastAfterIfMethod.kt"); doTest(fileName); } @TestMetadata("SmartCastForThis.kt") public void testSmartCastForThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastForThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastForThis.kt"); doTest(fileName); } @TestMetadata("SmartCastInWhen.kt") public void testSmartCastInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastInWhen.kt"); doTest(fileName); } @TestMetadata("SmartCastThis.kt") public void testSmartCastThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/smartCast/SmartCastThis.kt"); doTest(fileName); } } @@ -2064,42 +2064,42 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class SubstitutedSignature extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInSubstitutedSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/substitutedSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/substitutedSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("SubstitutedSignature1.kt") public void testSubstitutedSignature1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature2.kt") public void testSubstitutedSignature2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature2.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature3.kt") public void testSubstitutedSignature3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature4.kt") public void testSubstitutedSignature4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature4.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature5.kt") public void testSubstitutedSignature5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature5.kt"); doTest(fileName); } @TestMetadata("SubstitutedSignature6.kt") public void testSubstitutedSignature6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature6.kt"); doTest(fileName); } } @@ -2109,60 +2109,60 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Super extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/super"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("QualifierType1.kt") public void testQualifierType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType1.kt"); doTest(fileName); } @TestMetadata("QualifierType2.kt") public void testQualifierType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType2.kt"); doTest(fileName); } @TestMetadata("QualifierType3.kt") public void testQualifierType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType3.kt"); doTest(fileName); } @TestMetadata("QualifierType4.kt") public void testQualifierType4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType4.kt"); doTest(fileName); } @TestMetadata("QualifierType5.kt") public void testQualifierType5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType5.kt"); doTest(fileName); } @TestMetadata("QualifierType6.kt") public void testQualifierType6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierType6.kt"); doTest(fileName); } @TestMetadata("QualifierTypeAny.kt") public void testQualifierTypeAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAny.kt"); doTest(fileName); } @TestMetadata("QualifierTypeAnyInInterface.kt") public void testQualifierTypeAnyInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAnyInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeAnyInInterface.kt"); doTest(fileName); } @TestMetadata("QualifierTypeGeneric.kt") public void testQualifierTypeGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/super/QualifierTypeGeneric.kt"); doTest(fileName); } } @@ -2172,60 +2172,60 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class TypeArgsOrNot extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInTypeArgsOrNot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/typeArgsOrNot"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/typeArgsOrNot"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorTypeArg.kt") public void testConstructorTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/ConstructorTypeArg.kt"); doTest(fileName); } @TestMetadata("FunctionTypeArg.kt") public void testFunctionTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg.kt"); doTest(fileName); } @TestMetadata("FunctionTypeArg2.kt") public void testFunctionTypeArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt"); doTest(fileName); } @TestMetadata("LessThan.kt") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/LessThan.kt"); doTest(fileName); } @TestMetadata("NestedTypeArg.kt") public void testNestedTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/NestedTypeArg.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg.kt") public void testSecondTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg2.kt") public void testSecondTypeArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg2.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg3.kt") public void testSecondTypeArg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg3.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg4.kt") public void testSecondTypeArg4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/typeArgsOrNot/SecondTypeArg4.kt"); doTest(fileName); } } @@ -2235,78 +2235,78 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/common/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("VisibilityClassMembersFromExternal.kt") public void testVisibilityClassMembersFromExternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternal.kt"); doTest(fileName); } @TestMetadata("VisibilityClassMembersFromExternalForce.kt") public void testVisibilityClassMembersFromExternalForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternalForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityClassMembersFromExternalForce.kt"); doTest(fileName); } @TestMetadata("VisibilityInSubclass.kt") public void testVisibilityInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclass.kt"); doTest(fileName); } @TestMetadata("VisibilityInSubclassForce.kt") public void testVisibilityInSubclassForce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclassForce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityInSubclassForce.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThis.kt") public void testVisibilityPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInConstructor.kt") public void testVisibilityPrivateToThisInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructor.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInConstructorWithThis.kt") public void testVisibilityPrivateToThisInConstructorWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructorWithThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInConstructorWithThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisInSpecialScope.kt") public void testVisibilityPrivateToThisInSpecialScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInSpecialScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisInSpecialScope.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithReceiver.kt") public void testVisibilityPrivateToThisWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithReceiver2.kt") public void testVisibilityPrivateToThisWithReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithReceiver2.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithThis.kt") public void testVisibilityPrivateToThisWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithThis.kt"); doTest(fileName); } @TestMetadata("VisibilityPrivateToThisWithWrongThis.kt") public void testVisibilityPrivateToThisWithWrongThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithWrongThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/visibility/VisibilityPrivateToThisWithWrongThis.kt"); doTest(fileName); } } @@ -2317,84 +2317,84 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Java extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoForceCompletion.kt") public void testAutoForceCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/AutoForceCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/AutoForceCompletion.kt"); doTest(fileName); } @TestMetadata("ExtensionFromStandardLibrary.kt") public void testExtensionFromStandardLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt"); doTest(fileName); } @TestMetadata("InPackage.kt") public void testInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/InPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/InPackage.kt"); doTest(fileName); } @TestMetadata("JavaClassNames.kt") public void testJavaClassNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/JavaClassNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/JavaClassNames.kt"); doTest(fileName); } @TestMetadata("KProperty.kt") public void testKProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/KProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/KProperty.kt"); doTest(fileName); } @TestMetadata("NoDuplicationForImportedJavaClass.kt") public void testNoDuplicationForImportedJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoDuplicationForImportedJavaClass.kt"); doTest(fileName); } @TestMetadata("NoDuplicationForRuntimeClass.kt") public void testNoDuplicationForRuntimeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoDuplicationForRuntimeClass.kt"); doTest(fileName); } @TestMetadata("NoSyntheticClasses.kt") public void testNoSyntheticClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoSyntheticClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/NoSyntheticClasses.kt"); doTest(fileName); } @TestMetadata("Number.kt") public void testNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/Number.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/Number.kt"); doTest(fileName); } @TestMetadata("PackageDirective.kt") public void testPackageDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/PackageDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/PackageDirective.kt"); doTest(fileName); } @TestMetadata("SAMAdaptersStatic.kt") public void testSAMAdaptersStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/SAMAdaptersStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/SAMAdaptersStatic.kt"); doTest(fileName); } @TestMetadata("TopLevelFromStandardLibrary.kt") public void testTopLevelFromStandardLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/TopLevelFromStandardLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/TopLevelFromStandardLibrary.kt"); doTest(fileName); } @TestMetadata("TopLevelFromStandardLibraryWithoutParam.kt") public void testTopLevelFromStandardLibraryWithoutParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/TopLevelFromStandardLibraryWithoutParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/TopLevelFromStandardLibraryWithoutParam.kt"); doTest(fileName); } @@ -2403,36 +2403,36 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class BoldOrGrayed extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInBoldOrGrayed() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java/boldOrGrayed"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImmediateMembersForPlatformType.kt") public void testImmediateMembersForPlatformType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/ImmediateMembersForPlatformType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/ImmediateMembersForPlatformType.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCast1.kt") public void testNonPredictableSmartCast1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast1.kt"); doTest(fileName); } @TestMetadata("NonPredictableSmartCast2.kt") public void testNonPredictableSmartCast2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/NonPredictableSmartCast2.kt"); doTest(fileName); } @TestMetadata("SyntheticJavaProperties1.kt") public void testSyntheticJavaProperties1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties1.kt"); doTest(fileName); } @TestMetadata("SyntheticJavaProperties2.kt") public void testSyntheticJavaProperties2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/boldOrGrayed/SyntheticJavaProperties2.kt"); doTest(fileName); } } @@ -2442,60 +2442,60 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class SyntheticExtensions extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInSyntheticExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/java/syntheticExtensions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoNotHideGetterWhenExtensionCannotBeUsed.kt") public void testDoNotHideGetterWhenExtensionCannotBeUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/DoNotHideGetterWhenExtensionCannotBeUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/DoNotHideGetterWhenExtensionCannotBeUsed.kt"); doTest(fileName); } @TestMetadata("InGenericClass.kt") public void testInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/InGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/InGenericClass.kt"); doTest(fileName); } @TestMetadata("NullableReceiver.kt") public void testNullableReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/NullableReceiver.kt"); doTest(fileName); } @TestMetadata("SafeCall.kt") public void testSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SafeCall.kt"); doTest(fileName); } @TestMetadata("ShowGetSetOnSecondCompletion.kt") public void testShowGetSetOnSecondCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/ShowGetSetOnSecondCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/ShowGetSetOnSecondCompletion.kt"); doTest(fileName); } @TestMetadata("SmartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SmartCast.kt"); doTest(fileName); } @TestMetadata("SmartCast2.kt") public void testSmartCast2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SmartCast2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SmartCast2.kt"); doTest(fileName); } @TestMetadata("SyntheticExtensions1.kt") public void testSyntheticExtensions1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SyntheticExtensions1.kt"); doTest(fileName); } @TestMetadata("SyntheticExtensions2.kt") public void testSyntheticExtensions2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SyntheticExtensions2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/syntheticExtensions/SyntheticExtensions2.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java index f5ec5a65bd0..808954eefc1 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmSmartCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,503 +33,503 @@ import java.util.regex.Pattern; public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest { @TestMetadata("AbstractMembers.kt") public void testAbstractMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AbstractMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AbstractMembers.kt"); doTest(fileName); } @TestMetadata("AfterEmptyArgument.kt") public void testAfterEmptyArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterEmptyArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterEmptyArgument.kt"); doTest(fileName); } @TestMetadata("AfterExclSign.kt") public void testAfterExclSign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterExclSign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterExclSign.kt"); doTest(fileName); } @TestMetadata("AfterNamedArgument.kt") public void testAfterNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterNamedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AfterNamedArgument.kt"); doTest(fileName); } public void testAllFilesPresentInSmart() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnyExpected.kt") public void testAnyExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AnyExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/AnyExpected.kt"); doTest(fileName); } @TestMetadata("BeforeArgumentWithBinaryOperation.kt") public void testBeforeArgumentWithBinaryOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation.kt"); doTest(fileName); } @TestMetadata("BeforeArgumentWithBinaryOperation2.kt") public void testBeforeArgumentWithBinaryOperation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation2.kt"); doTest(fileName); } @TestMetadata("BeforeArgumentWithBinaryOperation3.kt") public void testBeforeArgumentWithBinaryOperation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BeforeArgumentWithBinaryOperation3.kt"); doTest(fileName); } @TestMetadata("BooleanExpected.kt") public void testBooleanExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BooleanExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/BooleanExpected.kt"); doTest(fileName); } @TestMetadata("ChainedCall.kt") public void testChainedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ChainedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ChainedCall.kt"); doTest(fileName); } @TestMetadata("ClassObjectMembers.kt") public void testClassObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembers.kt"); doTest(fileName); } @TestMetadata("ClassObjectMembersForNullable.kt") public void testClassObjectMembersForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembersForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembersForNullable.kt"); doTest(fileName); } @TestMetadata("ClassObjectMembersWithPrefix.kt") public void testClassObjectMembersWithPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembersWithPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ClassObjectMembersWithPrefix.kt"); doTest(fileName); } @TestMetadata("EmptyPrefix.kt") public void testEmptyPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EmptyPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EmptyPrefix.kt"); doTest(fileName); } @TestMetadata("EnumMembers.kt") public void testEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EnumMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EnumMembers.kt"); doTest(fileName); } @TestMetadata("EqOperator.kt") public void testEqOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EqOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/EqOperator.kt"); doTest(fileName); } @TestMetadata("FilterTo.kt") public void testFilterTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/FilterTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/FilterTo.kt"); doTest(fileName); } @TestMetadata("GroupBySubstitutor.kt") public void testGroupBySubstitutor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/GroupBySubstitutor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/GroupBySubstitutor.kt"); doTest(fileName); } @TestMetadata("HighOrderFunction.kt") public void testHighOrderFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/HighOrderFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/HighOrderFunction.kt"); doTest(fileName); } @TestMetadata("IfCondition.kt") public void testIfCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/IfCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/IfCondition.kt"); doTest(fileName); } @TestMetadata("ImmediateExtensionMembers.kt") public void testImmediateExtensionMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImmediateExtensionMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImmediateExtensionMembers.kt"); doTest(fileName); } @TestMetadata("ImmediateMembers.kt") public void testImmediateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImmediateMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImmediateMembers.kt"); doTest(fileName); } @TestMetadata("ImplicitlyTypedFunBody.kt") public void testImplicitlyTypedFunBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedFunBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedFunBody.kt"); doTest(fileName); } @TestMetadata("ImplicitlyTypedValInitializer1.kt") public void testImplicitlyTypedValInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer1.kt"); doTest(fileName); } @TestMetadata("ImplicitlyTypedValInitializer2.kt") public void testImplicitlyTypedValInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializer2.kt"); doTest(fileName); } @TestMetadata("ImplicitlyTypedValInitializerUnknownType.kt") public void testImplicitlyTypedValInitializerUnknownType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ImplicitlyTypedValInitializerUnknownType.kt"); doTest(fileName); } @TestMetadata("InClassObject.kt") public void testInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InClassObject.kt"); doTest(fileName); } @TestMetadata("InNestedClass.kt") public void testInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InNestedClass.kt"); doTest(fileName); } @TestMetadata("InaccessibleConstructor.kt") public void testInaccessibleConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InaccessibleConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InaccessibleConstructor.kt"); doTest(fileName); } @TestMetadata("InaccessibleDeclarations.kt") public void testInaccessibleDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InaccessibleDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InaccessibleDeclarations.kt"); doTest(fileName); } @TestMetadata("InfixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InfixCall.kt"); doTest(fileName); } @TestMetadata("InsideIdentifier.kt") public void testInsideIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InsideIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InsideIdentifier.kt"); doTest(fileName); } @TestMetadata("InvokeFunctionVariable.kt") public void testInvokeFunctionVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InvokeFunctionVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/InvokeFunctionVariable.kt"); doTest(fileName); } @TestMetadata("JavaEnumMembers.kt") public void testJavaEnumMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembers.kt"); doTest(fileName); } @TestMetadata("JavaEnumMembersAfterQualifier.kt") public void testJavaEnumMembersAfterQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembersAfterQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembersAfterQualifier.kt"); doTest(fileName); } @TestMetadata("JavaEnumMembersForNullable.kt") public void testJavaEnumMembersForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembersForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaEnumMembersForNullable.kt"); doTest(fileName); } @TestMetadata("JavaStaticFields.kt") public void testJavaStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticFields.kt"); doTest(fileName); } @TestMetadata("JavaStaticFieldsForNullable.kt") public void testJavaStaticFieldsForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticFieldsForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticFieldsForNullable.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethods.kt") public void testJavaStaticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/JavaStaticMethods.kt"); doTest(fileName); } @TestMetadata("kt5873.kt") public void testKt5873() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/kt5873.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/kt5873.kt"); doTest(fileName); } @TestMetadata("LambdaValue1.kt") public void testLambdaValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue1.kt"); doTest(fileName); } @TestMetadata("LambdaValue2.kt") public void testLambdaValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue2.kt"); doTest(fileName); } @TestMetadata("LambdaValue3.kt") public void testLambdaValue3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue3.kt"); doTest(fileName); } @TestMetadata("LambdaValue4.kt") public void testLambdaValue4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/LambdaValue4.kt"); doTest(fileName); } @TestMetadata("MapTo.kt") public void testMapTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MapTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MapTo.kt"); doTest(fileName); } @TestMetadata("MapTo2.kt") public void testMapTo2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MapTo2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MapTo2.kt"); doTest(fileName); } @TestMetadata("MethodCallArgument.kt") public void testMethodCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MethodCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/MethodCallArgument.kt"); doTest(fileName); } @TestMetadata("NamedArgument.kt") public void testNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NamedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NamedArgument.kt"); doTest(fileName); } @TestMetadata("NoExtensionMethodFromClassObject.kt") public void testNoExtensionMethodFromClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoExtensionMethodFromClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoExtensionMethodFromClassObject.kt"); doTest(fileName); } @TestMetadata("NoNothing.kt") public void testNoNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoNothing.kt"); doTest(fileName); } @TestMetadata("NoPrivateOverload.kt") public void testNoPrivateOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoPrivateOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoPrivateOverload.kt"); doTest(fileName); } @TestMetadata("NoSillyAssignment.kt") public void testNoSillyAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoSillyAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NoSillyAssignment.kt"); doTest(fileName); } @TestMetadata("NotEqOperator.kt") public void testNotEqOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NotEqOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NotEqOperator.kt"); doTest(fileName); } @TestMetadata("NotSillyAssignment.kt") public void testNotSillyAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NotSillyAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NotSillyAssignment.kt"); doTest(fileName); } @TestMetadata("Null.kt") public void testNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Null.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Null.kt"); doTest(fileName); } @TestMetadata("NullableBooleanExpected.kt") public void testNullableBooleanExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NullableBooleanExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/NullableBooleanExpected.kt"); doTest(fileName); } @TestMetadata("Object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/Object.kt"); doTest(fileName); } @TestMetadata("ObjectsFromType.kt") public void testObjectsFromType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ObjectsFromType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ObjectsFromType.kt"); doTest(fileName); } @TestMetadata("OverloadedConstructorArgument.kt") public void testOverloadedConstructorArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedConstructorArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedConstructorArgument.kt"); doTest(fileName); } @TestMetadata("OverloadedMethodCallArgument1.kt") public void testOverloadedMethodCallArgument1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument1.kt"); doTest(fileName); } @TestMetadata("OverloadedMethodCallArgument2.kt") public void testOverloadedMethodCallArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument2.kt"); doTest(fileName); } @TestMetadata("OverloadedMethodCallArgument3.kt") public void testOverloadedMethodCallArgument3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/OverloadedMethodCallArgument3.kt"); doTest(fileName); } @TestMetadata("ParameterWithDefaultValue.kt") public void testParameterWithDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ParameterWithDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ParameterWithDefaultValue.kt"); doTest(fileName); } @TestMetadata("PreviousArgError.kt") public void testPreviousArgError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/PreviousArgError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/PreviousArgError.kt"); doTest(fileName); } @TestMetadata("PreviousArgMismatchedType.kt") public void testPreviousArgMismatchedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/PreviousArgMismatchedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/PreviousArgMismatchedType.kt"); doTest(fileName); } @TestMetadata("QualifiedOverloadedMethodCallArgument1.kt") public void testQualifiedOverloadedMethodCallArgument1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/QualifiedOverloadedMethodCallArgument1.kt"); doTest(fileName); } @TestMetadata("QualifiedOverloadedMethodCallArgument2.kt") public void testQualifiedOverloadedMethodCallArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/QualifiedOverloadedMethodCallArgument2.kt"); doTest(fileName); } @TestMetadata("SAMExpected1.kt") public void testSAMExpected1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SAMExpected1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SAMExpected1.kt"); doTest(fileName); } @TestMetadata("SAMExpected2.kt") public void testSAMExpected2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SAMExpected2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SAMExpected2.kt"); doTest(fileName); } @TestMetadata("SealedMembers.kt") public void testSealedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SealedMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SealedMembers.kt"); doTest(fileName); } @TestMetadata("SkipDeclarationsOfType.kt") public void testSkipDeclarationsOfType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SkipDeclarationsOfType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SkipDeclarationsOfType.kt"); doTest(fileName); } @TestMetadata("SkipUnresolvedTypes.kt") public void testSkipUnresolvedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SkipUnresolvedTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SkipUnresolvedTypes.kt"); doTest(fileName); } @TestMetadata("SuperConstructorArgument.kt") public void testSuperConstructorArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SuperConstructorArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SuperConstructorArgument.kt"); doTest(fileName); } @TestMetadata("SuperConstructorArgumentInClassHeader.kt") public void testSuperConstructorArgumentInClassHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SuperConstructorArgumentInClassHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/SuperConstructorArgumentInClassHeader.kt"); doTest(fileName); } @TestMetadata("ThisConstructorArgument.kt") public void testThisConstructorArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ThisConstructorArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ThisConstructorArgument.kt"); doTest(fileName); } @TestMetadata("UnresolvedExpectedType.kt") public void testUnresolvedExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/UnresolvedExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/UnresolvedExpectedType.kt"); doTest(fileName); } @TestMetadata("VariableAsFunction1.kt") public void testVariableAsFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableAsFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableAsFunction1.kt"); doTest(fileName); } @TestMetadata("VariableAsFunction3.kt") public void testVariableAsFunction3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableAsFunction3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableAsFunction3.kt"); doTest(fileName); } @TestMetadata("VariableInitializer.kt") public void testVariableInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/VariableInitializer.kt"); doTest(fileName); } @TestMetadata("WithPrefix.kt") public void testWithPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WithPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WithPrefix.kt"); doTest(fileName); } @TestMetadata("WithQualifier.kt") public void testWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WithQualifier.kt"); doTest(fileName); } @TestMetadata("WrongNumberOfTypeArguments.kt") public void testWrongNumberOfTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WrongNumberOfTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WrongNumberOfTypeArguments.kt"); doTest(fileName); } @TestMetadata("WrongReceiver.kt") public void testWrongReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WrongReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/WrongReceiver.kt"); doTest(fileName); } @@ -539,24 +539,24 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class AfterAs extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/afterAs/3.kt"); doTest(fileName); } public void testAllFilesPresentInAfterAs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/afterAs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/afterAs"), Pattern.compile("^(.+)\\.kt$"), true); } } @@ -566,35 +566,35 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class AnonymousObject extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/2.kt"); doTest(fileName); } public void testAllFilesPresentInAnonymousObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/anonymousObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/anonymousObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ForJavaInterface.kt") public void testForJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/ForJavaInterface.kt"); doTest(fileName); } @TestMetadata("UninferredTypeArgs.kt") public void testUninferredTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/UninferredTypeArgs.kt"); doTest(fileName); } @TestMetadata("WithPrefix.kt") public void testWithPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/anonymousObject/WithPrefix.kt"); doTest(fileName); } } @@ -605,137 +605,137 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class CallableReference extends AbstractJvmSmartCompletionTest { @TestMetadata("AfterDot.kt") public void testAfterDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/AfterDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/AfterDot.kt"); doTest(fileName); } public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassLiteral.kt") public void testClassLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ClassLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ClassLiteral.kt"); doTest(fileName); } @TestMetadata("ClassLiteralDotJava.kt") public void testClassLiteralDotJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ClassLiteralDotJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ClassLiteralDotJava.kt"); doTest(fileName); } @TestMetadata("ConcreteJavaClassExpected.kt") public void testConcreteJavaClassExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteJavaClassExpected.kt"); doTest(fileName); } @TestMetadata("ConcreteKClassExpected.kt") public void testConcreteKClassExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteKClassExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteKClassExpected.kt"); doTest(fileName); } @TestMetadata("ConcreteKClassExpectedNoDuplicates.kt") public void testConcreteKClassExpectedNoDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/ConcreteKClassExpectedNoDuplicates.kt"); doTest(fileName); } @TestMetadata("EmptyQualifier1.kt") public void testEmptyQualifier1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier1.kt"); doTest(fileName); } @TestMetadata("EmptyQualifier2.kt") public void testEmptyQualifier2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier2.kt"); doTest(fileName); } @TestMetadata("EmptyQualifier3.kt") public void testEmptyQualifier3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/EmptyQualifier3.kt"); doTest(fileName); } @TestMetadata("NoQualifier1.kt") public void testNoQualifier1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier1.kt"); doTest(fileName); } @TestMetadata("NoQualifier10.kt") public void testNoQualifier10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier10.kt"); doTest(fileName); } @TestMetadata("NoQualifier12.kt") public void testNoQualifier12() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier12.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier12.kt"); doTest(fileName); } @TestMetadata("NoQualifier2.kt") public void testNoQualifier2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier2.kt"); doTest(fileName); } @TestMetadata("NoQualifier3.kt") public void testNoQualifier3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier3.kt"); doTest(fileName); } @TestMetadata("NoQualifier4.kt") public void testNoQualifier4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier4.kt"); doTest(fileName); } @TestMetadata("NoQualifier7.kt") public void testNoQualifier7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier7.kt"); doTest(fileName); } @TestMetadata("NoQualifier9.kt") public void testNoQualifier9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifier9.kt"); doTest(fileName); } @TestMetadata("NoQualifierMultipleConstructors.kt") public void testNoQualifierMultipleConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifierMultipleConstructors.kt"); doTest(fileName); } @TestMetadata("NoQualifierPropertyExpected.kt") public void testNoQualifierPropertyExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NoQualifierPropertyExpected.kt"); doTest(fileName); } @TestMetadata("NonConcreteKClassExpected.kt") public void testNonConcreteKClassExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonConcreteKClassExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonConcreteKClassExpected.kt"); doTest(fileName); } @TestMetadata("NonEmptyQualifier1.kt") public void testNonEmptyQualifier1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonEmptyQualifier1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonEmptyQualifier1.kt"); doTest(fileName); } @TestMetadata("NonEmptyQualifier2.kt") public void testNonEmptyQualifier2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonEmptyQualifier2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/callableReference/NonEmptyQualifier2.kt"); doTest(fileName); } } @@ -745,72 +745,72 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("GenericJavaClass.kt") public void testGenericJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/GenericJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/GenericJavaClass.kt"); doTest(fileName); } @TestMetadata("GenericType.kt") public void testGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/GenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/GenericType.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/InnerClass.kt"); doTest(fileName); } @TestMetadata("JavaClass.kt") public void testJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/JavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/JavaClass.kt"); doTest(fileName); } @TestMetadata("NoConstructorWithQualifier.kt") public void testNoConstructorWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/NoConstructorWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/NoConstructorWithQualifier.kt"); doTest(fileName); } @TestMetadata("NoInnerClassInstantiation.kt") public void testNoInnerClassInstantiation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/NoInnerClassInstantiation.kt"); doTest(fileName); } @TestMetadata("Nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/Nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/Nullable.kt"); doTest(fileName); } @TestMetadata("PrivateConstructorForAbstract.kt") public void testPrivateConstructorForAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/PrivateConstructorForAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/PrivateConstructorForAbstract.kt"); doTest(fileName); } @TestMetadata("ProtectedConstructorForAbstract.kt") public void testProtectedConstructorForAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/ProtectedConstructorForAbstract.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/Simple.kt"); doTest(fileName); } @TestMetadata("WithParameters.kt") public void testWithParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/WithParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/constructor/WithParameters.kt"); doTest(fileName); } } @@ -821,47 +821,47 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class ForLoopRange extends AbstractJvmSmartCompletionTest { @TestMetadata("AfterDot.kt") public void testAfterDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/AfterDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/AfterDot.kt"); doTest(fileName); } public void testAllFilesPresentInForLoopRange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/forLoopRange"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/forLoopRange"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExtensionIteratorMethod.kt") public void testExtensionIteratorMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/ExtensionIteratorMethod.kt"); doTest(fileName); } @TestMetadata("NoGenericT.kt") public void testNoGenericT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/NoGenericT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/NoGenericT.kt"); doTest(fileName); } @TestMetadata("Nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/Nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/Nullable.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/Simple.kt"); doTest(fileName); } @TestMetadata("SmartCasts.kt") public void testSmartCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/SmartCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/SmartCasts.kt"); doTest(fileName); } @TestMetadata("TypedLoopVar.kt") public void testTypedLoopVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt"); doTest(fileName); } } @@ -872,101 +872,101 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class FunctionLiterals extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/4.kt"); doTest(fileName); } @TestMetadata("5.kt") public void test5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/5.kt"); doTest(fileName); } public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("OutsideCallParenthesis1.kt") public void testOutsideCallParenthesis1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis1.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis2.kt") public void testOutsideCallParenthesis2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis2.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis3.kt") public void testOutsideCallParenthesis3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis3.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis4.kt") public void testOutsideCallParenthesis4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis4.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis5.kt") public void testOutsideCallParenthesis5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis5.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis6.kt") public void testOutsideCallParenthesis6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis6.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis7.kt") public void testOutsideCallParenthesis7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis7.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis8.kt") public void testOutsideCallParenthesis8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis8.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesis9.kt") public void testOutsideCallParenthesis9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesis9.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesisAndVararg1.kt") public void testOutsideCallParenthesisAndVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg1.kt"); doTest(fileName); } @TestMetadata("OutsideCallParenthesisAndVararg2.kt") public void testOutsideCallParenthesisAndVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/functionLiterals/OutsideCallParenthesisAndVararg2.kt"); doTest(fileName); } } @@ -976,42 +976,42 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class Generics extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/generics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/generics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("GenericFunction1.kt") public void testGenericFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction1.kt"); doTest(fileName); } @TestMetadata("GenericFunction2.kt") public void testGenericFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction2.kt"); doTest(fileName); } @TestMetadata("GenericFunction3.kt") public void testGenericFunction3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction3.kt"); doTest(fileName); } @TestMetadata("GenericFunction4.kt") public void testGenericFunction4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction4.kt"); doTest(fileName); } @TestMetadata("GenericFunction5.kt") public void testGenericFunction5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericFunction5.kt"); doTest(fileName); } @TestMetadata("GenericMethodArgument.kt") public void testGenericMethodArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericMethodArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/generics/GenericMethodArgument.kt"); doTest(fileName); } } @@ -1021,84 +1021,84 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class HeuristicSignatures extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInHeuristicSignatures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/heuristicSignatures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/heuristicSignatures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Contains.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Contains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Contains.kt"); doTest(fileName); } @TestMetadata("ContainsAll.kt") public void testContainsAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsAll.kt"); doTest(fileName); } @TestMetadata("ContainsKey.kt") public void testContainsKey() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsKey.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsKey.kt"); doTest(fileName); } @TestMetadata("ContainsValue.kt") public void testContainsValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/ContainsValue.kt"); doTest(fileName); } @TestMetadata("Get.kt") public void testGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Get.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Get.kt"); doTest(fileName); } @TestMetadata("GetWithBrackets.kt") public void testGetWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/GetWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/GetWithBrackets.kt"); doTest(fileName); } @TestMetadata("InOperator.kt") public void testInOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/InOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/InOperator.kt"); doTest(fileName); } @TestMetadata("IndexOf.kt") public void testIndexOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/IndexOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/IndexOf.kt"); doTest(fileName); } @TestMetadata("LastIndexOf.kt") public void testLastIndexOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/LastIndexOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/LastIndexOf.kt"); doTest(fileName); } @TestMetadata("MapRemove.kt") public void testMapRemove() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/MapRemove.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/MapRemove.kt"); doTest(fileName); } @TestMetadata("Remove.kt") public void testRemove() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Remove.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/Remove.kt"); doTest(fileName); } @TestMetadata("RemoveAll.kt") public void testRemoveAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/RemoveAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/RemoveAll.kt"); doTest(fileName); } @TestMetadata("RetainAll.kt") public void testRetainAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/RetainAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/heuristicSignatures/RetainAll.kt"); doTest(fileName); } } @@ -1109,41 +1109,41 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class IfValue extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/4.kt"); doTest(fileName); } public void testAllFilesPresentInIfValue() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/ifValue"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/ifValue"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InBlock1.kt") public void testInBlock1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/InBlock1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/InBlock1.kt"); doTest(fileName); } @TestMetadata("InBlock2.kt") public void testInBlock2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/InBlock2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/ifValue/InBlock2.kt"); doTest(fileName); } } @@ -1154,42 +1154,42 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class InElvisOperator extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/4.kt"); doTest(fileName); } @TestMetadata("5.kt") public void test5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/5.kt"); doTest(fileName); } @TestMetadata("6.kt") public void test6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inElvisOperator/6.kt"); doTest(fileName); } public void testAllFilesPresentInInElvisOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inElvisOperator"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inElvisOperator"), Pattern.compile("^(.+)\\.kt$"), true); } } @@ -1198,66 +1198,66 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class InOperator extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInInOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inOperator"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inOperator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExtensionContains.kt") public void testExtensionContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/ExtensionContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/ExtensionContains.kt"); doTest(fileName); } @TestMetadata("FilterByArgumentType.kt") public void testFilterByArgumentType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/FilterByArgumentType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/FilterByArgumentType.kt"); doTest(fileName); } @TestMetadata("GenericMethod.kt") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod.kt"); doTest(fileName); } @TestMetadata("GenericMethod2.kt") public void testGenericMethod2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod2.kt"); doTest(fileName); } @TestMetadata("GenericMethod3.kt") public void testGenericMethod3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/GenericMethod3.kt"); doTest(fileName); } @TestMetadata("NonBooleanContains.kt") public void testNonBooleanContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/NonBooleanContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/NonBooleanContains.kt"); doTest(fileName); } @TestMetadata("NotIn.kt") public void testNotIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/NotIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/NotIn.kt"); doTest(fileName); } @TestMetadata("Nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/Nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/Nullable.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/Simple.kt"); doTest(fileName); } @TestMetadata("SmartCasts.kt") public void testSmartCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/SmartCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inOperator/SmartCasts.kt"); doTest(fileName); } } @@ -1268,59 +1268,59 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class Inheritors extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/3.kt"); doTest(fileName); } public void testAllFilesPresentInInheritors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inheritors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/inheritors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("GenericClass1.kt") public void testGenericClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass1.kt"); doTest(fileName); } @TestMetadata("GenericClass2.kt") public void testGenericClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass2.kt"); doTest(fileName); } @TestMetadata("GenericClass3.kt") public void testGenericClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass3.kt"); doTest(fileName); } @TestMetadata("GenericClass4.kt") public void testGenericClass4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass4.kt"); doTest(fileName); } @TestMetadata("GenericClass5.kt") public void testGenericClass5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass5.kt"); doTest(fileName); } @TestMetadata("GenericClass6.kt") public void testGenericClass6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/inheritors/GenericClass6.kt"); doTest(fileName); } } @@ -1331,77 +1331,77 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class MultipleArgsItem extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/1.kt"); doTest(fileName); } @TestMetadata("10.kt") public void test10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/10.kt"); doTest(fileName); } @TestMetadata("11.kt") public void test11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/11.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/4.kt"); doTest(fileName); } @TestMetadata("5.kt") public void test5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/5.kt"); doTest(fileName); } @TestMetadata("6.kt") public void test6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/6.kt"); doTest(fileName); } @TestMetadata("7.kt") public void test7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/7.kt"); doTest(fileName); } @TestMetadata("8.kt") public void test8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/8.kt"); doTest(fileName); } @TestMetadata("9.kt") public void test9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/9.kt"); doTest(fileName); } public void testAllFilesPresentInMultipleArgsItem() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/multipleArgsItem"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/multipleArgsItem"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CallWithBrackets.kt") public void testCallWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/CallWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/multipleArgsItem/CallWithBrackets.kt"); doTest(fileName); } } @@ -1411,66 +1411,66 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class SmartCasts extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInSmartCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/smartCasts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AutoNotNullThisType.kt") public void testAutoNotNullThisType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullThisType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullThisType.kt"); doTest(fileName); } @TestMetadata("AutoNotNullType.kt") public void testAutoNotNullType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullType.kt"); doTest(fileName); } @TestMetadata("AutoNotNullType2.kt") public void testAutoNotNullType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullType2.kt"); doTest(fileName); } @TestMetadata("AutoNotNullTypeForConstructorParameter.kt") public void testAutoNotNullTypeForConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullTypeForConstructorParameter.kt"); doTest(fileName); } @TestMetadata("AutoNotNullTypeWithQualifier.kt") public void testAutoNotNullTypeWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/AutoNotNullTypeWithQualifier.kt"); doTest(fileName); } @TestMetadata("CheckCorrectThis.kt") public void testCheckCorrectThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/CheckCorrectThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/CheckCorrectThis.kt"); doTest(fileName); } @TestMetadata("SmartCastThisType1.kt") public void testSmartCastThisType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastThisType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastThisType1.kt"); doTest(fileName); } @TestMetadata("SmartCastThisType2.kt") public void testSmartCastThisType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastThisType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastThisType2.kt"); doTest(fileName); } @TestMetadata("SmartCastType.kt") public void testSmartCastType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastType.kt"); doTest(fileName); } @TestMetadata("SmartCastTypeWithQualifier.kt") public void testSmartCastTypeWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/smartCasts/SmartCastTypeWithQualifier.kt"); doTest(fileName); } } @@ -1480,54 +1480,54 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT @RunWith(JUnit3RunnerWithInners.class) public static class This extends AbstractJvmSmartCompletionTest { public void testAllFilesPresentInThis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/this"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/this"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NoQualifiedThisOfAnonymousObject.kt") public void testNoQualifiedThisOfAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/NoQualifiedThisOfAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/NoQualifiedThisOfAnonymousObject.kt"); doTest(fileName); } @TestMetadata("NullableThis.kt") public void testNullableThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/NullableThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/NullableThis.kt"); doTest(fileName); } @TestMetadata("QualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThis.kt"); doTest(fileName); } @TestMetadata("QualifiedThisOfExtensionFunction.kt") public void testQualifiedThisOfExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionFunction.kt"); doTest(fileName); } @TestMetadata("QualifiedThisOfExtensionLambda1.kt") public void testQualifiedThisOfExtensionLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda1.kt"); doTest(fileName); } @TestMetadata("QualifiedThisOfExtensionLambda2.kt") public void testQualifiedThisOfExtensionLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda2.kt"); doTest(fileName); } @TestMetadata("QualifiedThisOfExtensionLambda3.kt") public void testQualifiedThisOfExtensionLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/QualifiedThisOfExtensionLambda3.kt"); doTest(fileName); } @TestMetadata("This.kt") public void testThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/This.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/this/This.kt"); doTest(fileName); } } @@ -1538,47 +1538,47 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class Vararg extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/4.kt"); doTest(fileName); } @TestMetadata("AfterStar.kt") public void testAfterStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/AfterStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/AfterStar.kt"); doTest(fileName); } public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NamedArgumentAfterStar.kt") public void testNamedArgumentAfterStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/NamedArgumentAfterStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/NamedArgumentAfterStar.kt"); doTest(fileName); } @TestMetadata("SecondVararg.kt") public void testSecondVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/SecondVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/vararg/SecondVararg.kt"); doTest(fileName); } } @@ -1589,77 +1589,77 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT public static class WhenEntry extends AbstractJvmSmartCompletionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/4.kt"); doTest(fileName); } @TestMetadata("5.kt") public void test5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/5.kt"); doTest(fileName); } @TestMetadata("6.kt") public void test6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/6.kt"); doTest(fileName); } @TestMetadata("7.kt") public void test7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/7.kt"); doTest(fileName); } @TestMetadata("8.kt") public void test8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/8.kt"); doTest(fileName); } @TestMetadata("9.kt") public void test9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/9.kt"); doTest(fileName); } public void testAllFilesPresentInWhenEntry() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/whenEntry"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smart/whenEntry"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("WhenWithNoSubject1.kt") public void testWhenWithNoSubject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithNoSubject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithNoSubject1.kt"); doTest(fileName); } @TestMetadata("WhenWithNoSubject2.kt") public void testWhenWithNoSubject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithNoSubject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithNoSubject2.kt"); doTest(fileName); } @TestMetadata("WhenWithSubjectTrueFalse.kt") public void testWhenWithSubjectTrueFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smart/whenEntry/WhenWithSubjectTrueFalse.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java index eac10725bd9..fc8a56ec8db 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmWithLibBasicCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,54 +32,54 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest { public void testAllFilesPresentInWithLib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/withLib"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("NamedArgumentsJava.kt") public void testNamedArgumentsJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsJava.kt"); doTest(fileName); } @TestMetadata("NamedArgumentsKotlin.kt") public void testNamedArgumentsKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/NamedArgumentsKotlin.kt"); doTest(fileName); } @TestMetadata("SamAdapter.kt") public void testSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapter.kt"); doTest(fileName); } @TestMetadata("SamAdapterAndGenerics.kt") public void testSamAdapterAndGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/SamAdapterAndGenerics.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedExtFun.kt") public void testTopLevelNonImportedExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtFun.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedExtProp.kt") public void testTopLevelNonImportedExtProp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedExtProp.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedFun.kt") public void testTopLevelNonImportedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedFun.kt"); doTest(fileName); } @TestMetadata("TopLevelNonImportedProperty.kt") public void testTopLevelNonImportedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/withLib/TopLevelNonImportedProperty.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java index ea729a08e8d..4cc871a261c 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KDocCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KDocCompletionTestGenerated extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInKdoc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/kdoc"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/kdoc"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Link.kt") public void testLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/Link.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/Link.kt"); doTest(fileName); } @TestMetadata("MemberLink.kt") public void testMemberLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberLink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/MemberLink.kt"); doTest(fileName); } @TestMetadata("NotTagName.kt") public void testNotTagName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/NotTagName.kt"); doTest(fileName); } @TestMetadata("ParamTag.kt") public void testParamTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/ParamTag.kt"); doTest(fileName); } @TestMetadata("SkipExistingParamTag.kt") public void testSkipExistingParamTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/SkipExistingParamTag.kt"); doTest(fileName); } @TestMetadata("TagName.kt") public void testTagName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagName.kt"); doTest(fileName); } @TestMetadata("TagNameAfterAt.kt") public void testTagNameAfterAt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameAfterAt.kt"); doTest(fileName); } @TestMetadata("TagNameMiddle.kt") public void testTagNameMiddle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameMiddle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameMiddle.kt"); doTest(fileName); } @TestMetadata("TagNameStart.kt") public void testTagNameStart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameStart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/kdoc/TagNameStart.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java index cc52359e09e..ef173461203 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KeywordCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,491 +33,491 @@ import java.util.regex.Pattern; public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest { @TestMetadata("AfterClassProperty.kt") public void testAfterClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClassProperty.kt"); doTest(fileName); } @TestMetadata("AfterClasses.kt") public void testAfterClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterClasses.kt"); doTest(fileName); } @TestMetadata("AfterDot.kt") public void testAfterDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterDot.kt"); doTest(fileName); } @TestMetadata("AfterFuns.kt") public void testAfterFuns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterFuns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterFuns.kt"); doTest(fileName); } @TestMetadata("AfterSafeDot.kt") public void testAfterSafeDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSafeDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSafeDot.kt"); doTest(fileName); } @TestMetadata("AfterSpaceAndDot.kt") public void testAfterSpaceAndDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt"); doTest(fileName); } public void testAllFilesPresentInKeywords() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/keywords"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/keywords"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("BeforeClass.kt") public void testBeforeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeClass.kt"); doTest(fileName); } @TestMetadata("BeforeDelegationCall.kt") public void testBeforeDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BeforeDelegationCall.kt"); doTest(fileName); } @TestMetadata("BreakContinue.kt") public void testBreakContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakContinue.kt"); doTest(fileName); } @TestMetadata("BreakWithLabel.kt") public void testBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/BreakWithLabel.kt"); doTest(fileName); } @TestMetadata("CommaExpected.kt") public void testCommaExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CommaExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CommaExpected.kt"); doTest(fileName); } @TestMetadata("CompanionObjectBeforeObject.kt") public void testCompanionObjectBeforeObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt"); doTest(fileName); } @TestMetadata("ContinueWithLabel.kt") public void testContinueWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ContinueWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ContinueWithLabel.kt"); doTest(fileName); } @TestMetadata("FileKeyword.kt") public void testFileKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/FileKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/FileKeyword.kt"); doTest(fileName); } @TestMetadata("GlobalPropertyAccessors.kt") public void testGlobalPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt"); doTest(fileName); } @TestMetadata("InAnnotationClassScope.kt") public void testInAnnotationClassScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InAnnotationClassScope.kt"); doTest(fileName); } @TestMetadata("InArgumentList.kt") public void testInArgumentList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InArgumentList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InArgumentList.kt"); doTest(fileName); } @TestMetadata("InBlockComment.kt") public void testInBlockComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InBlockComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InBlockComment.kt"); doTest(fileName); } @TestMetadata("InChar.kt") public void testInChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InChar.kt"); doTest(fileName); } @TestMetadata("InClassBeforeFun.kt") public void testInClassBeforeFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassBeforeFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassBeforeFun.kt"); doTest(fileName); } @TestMetadata("InClassNoCompletionInValName.kt") public void testInClassNoCompletionInValName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt"); doTest(fileName); } @TestMetadata("InClassProperty.kt") public void testInClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassProperty.kt"); doTest(fileName); } @TestMetadata("InClassScope.kt") public void testInClassScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassScope.kt"); doTest(fileName); } @TestMetadata("InClassTypeParameters.kt") public void testInClassTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InClassTypeParameters.kt"); doTest(fileName); } @TestMetadata("InCodeBlock.kt") public void testInCodeBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InCodeBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InCodeBlock.kt"); doTest(fileName); } @TestMetadata("InEnumScope1.kt") public void testInEnumScope1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope1.kt"); doTest(fileName); } @TestMetadata("InEnumScope2.kt") public void testInEnumScope2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InEnumScope2.kt"); doTest(fileName); } @TestMetadata("InFunctionExpressionBody.kt") public void testInFunctionExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt"); doTest(fileName); } @TestMetadata("InFunctionName.kt") public void testInFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionName.kt"); doTest(fileName); } @TestMetadata("InFunctionRecieverType.kt") public void testInFunctionRecieverType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionRecieverType.kt"); doTest(fileName); } @TestMetadata("InFunctionTypePosition.kt") public void testInFunctionTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InFunctionTypePosition.kt"); doTest(fileName); } @TestMetadata("InGetterExpressionBody.kt") public void testInGetterExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InGetterExpressionBody.kt"); doTest(fileName); } @TestMetadata("InInterfaceScope.kt") public void testInInterfaceScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InInterfaceScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InInterfaceScope.kt"); doTest(fileName); } @TestMetadata("InMemberFunParametersList.kt") public void testInMemberFunParametersList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InMemberFunParametersList.kt"); doTest(fileName); } @TestMetadata("InModifierListInsideClass.kt") public void testInModifierListInsideClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InModifierListInsideClass.kt"); doTest(fileName); } @TestMetadata("InNotFinishedGenericWithFunAfter.kt") public void testInNotFinishedGenericWithFunAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt"); doTest(fileName); } @TestMetadata("InObjectScope.kt") public void testInObjectScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InObjectScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InObjectScope.kt"); doTest(fileName); } @TestMetadata("InParameterDefaultValue.kt") public void testInParameterDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InParameterDefaultValue.kt"); doTest(fileName); } @TestMetadata("InPrimaryConstructorParametersList.kt") public void testInPrimaryConstructorParametersList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt"); doTest(fileName); } @TestMetadata("InPropertyInitializer.kt") public void testInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("InPropertyTypeReference.kt") public void testInPropertyTypeReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InPropertyTypeReference.kt"); doTest(fileName); } @TestMetadata("InString.kt") public void testInString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InString.kt"); doTest(fileName); } @TestMetadata("InTopFunParametersList.kt") public void testInTopFunParametersList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopFunParametersList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopFunParametersList.kt"); doTest(fileName); } @TestMetadata("InTopScopeAfterPackage.kt") public void testInTopScopeAfterPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt"); doTest(fileName); } @TestMetadata("LabeledLambdaThis.kt") public void testLabeledLambdaThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LabeledLambdaThis.kt"); doTest(fileName); } @TestMetadata("LineComment.kt") public void testLineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LineComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/LineComment.kt"); doTest(fileName); } @TestMetadata("NoBreak1.kt") public void testNoBreak1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak1.kt"); doTest(fileName); } @TestMetadata("NoBreak2.kt") public void testNoBreak2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoBreak2.kt"); doTest(fileName); } @TestMetadata("NoCompanionThis.kt") public void testNoCompanionThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompanionThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompanionThis.kt"); doTest(fileName); } @TestMetadata("NoCompletionForCapitalPrefix.kt") public void testNoCompletionForCapitalPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt"); doTest(fileName); } @TestMetadata("NoContinue.kt") public void testNoContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoContinue.kt"); doTest(fileName); } @TestMetadata("NoFinalInParameterList.kt") public void testNoFinalInParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NoFinalInParameterList.kt"); doTest(fileName); } @TestMetadata("NotInNotIs.kt") public void testNotInNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/NotInNotIs.kt"); doTest(fileName); } @TestMetadata("PrefixMatcher.kt") public void testPrefixMatcher() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PrefixMatcher.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PrefixMatcher.kt"); doTest(fileName); } @TestMetadata("PropertyAccessors.kt") public void testPropertyAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors.kt"); doTest(fileName); } @TestMetadata("PropertyAccessors2.kt") public void testPropertyAccessors2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertyAccessors2.kt"); doTest(fileName); } @TestMetadata("PropertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/PropertySetter.kt"); doTest(fileName); } @TestMetadata("QualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThis.kt"); doTest(fileName); } @TestMetadata("QualifiedThisInAccessor.kt") public void testQualifiedThisInAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/QualifiedThisInAccessor.kt"); doTest(fileName); } @TestMetadata("Return1.kt") public void testReturn1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return1.kt"); doTest(fileName); } @TestMetadata("Return2.kt") public void testReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return2.kt"); doTest(fileName); } @TestMetadata("Return3.kt") public void testReturn3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return3.kt"); doTest(fileName); } @TestMetadata("Return4.kt") public void testReturn4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return4.kt"); doTest(fileName); } @TestMetadata("Return5.kt") public void testReturn5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return5.kt"); doTest(fileName); } @TestMetadata("Return6.kt") public void testReturn6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return6.kt"); doTest(fileName); } @TestMetadata("Return7.kt") public void testReturn7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return7.kt"); doTest(fileName); } @TestMetadata("Return8.kt") public void testReturn8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return8.kt"); doTest(fileName); } @TestMetadata("Return9.kt") public void testReturn9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/Return9.kt"); doTest(fileName); } @TestMetadata("ReturnBoolean.kt") public void testReturnBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnBoolean.kt"); doTest(fileName); } @TestMetadata("ReturnCollection.kt") public void testReturnCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnCollection.kt"); doTest(fileName); } @TestMetadata("ReturnIterable.kt") public void testReturnIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnIterable.kt"); doTest(fileName); } @TestMetadata("ReturnKeywordName.kt") public void testReturnKeywordName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnKeywordName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnKeywordName.kt"); doTest(fileName); } @TestMetadata("ReturnList.kt") public void testReturnList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnList.kt"); doTest(fileName); } @TestMetadata("ReturnNotNull.kt") public void testReturnNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnNull.kt") public void testReturnNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNull.kt"); doTest(fileName); } @TestMetadata("ReturnNullableBoolean.kt") public void testReturnNullableBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt"); doTest(fileName); } @TestMetadata("ReturnSet.kt") public void testReturnSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ReturnSet.kt"); doTest(fileName); } @TestMetadata("This.kt") public void testThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/This.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/This.kt"); doTest(fileName); } @TestMetadata("ThisPrefixMatching.kt") public void testThisPrefixMatching() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/ThisPrefixMatching.kt"); doTest(fileName); } @TestMetadata("TopScope.kt") public void testTopScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/TopScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/TopScope.kt"); doTest(fileName); } @TestMetadata("UseSiteTargetForPrimaryConstructorParameter.kt") public void testUseSiteTargetForPrimaryConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/keywords/UseSiteTargetForPrimaryConstructorParameter.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java index 97f1ca6afb4..9b0824a2a3a 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinCompletionTestCase.java @@ -20,20 +20,20 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.completion.CompletionTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.util.ArrayUtil; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; abstract public class KotlinCompletionTestCase extends CompletionTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = new String[]{"excludedPackage", "somePackage.ExcludedClass"}; } @Override protected void tearDown() throws Exception { CodeInsightSettings.getInstance().EXCLUDED_PACKAGES = ArrayUtil.EMPTY_STRING_ARRAY; - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt index 52fd7be0aac..8e0ba5eab50 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinFixtureCompletionBaseTestCase.kt @@ -20,11 +20,11 @@ import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.TargetPlatform import java.io.File -public abstract class KotlinFixtureCompletionBaseTestCase : JetLightCodeInsightFixtureTestCase() { +public abstract class KotlinFixtureCompletionBaseTestCase : KotlinLightCodeInsightFixtureTestCase() { public abstract fun getPlatform(): TargetPlatform protected open fun complete(completionType: CompletionType, invocationCount: Int): Array? diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java index d32e6e99e99..8e4941a7530 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,168 +32,168 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/injava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotationParameter.java") public void testAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/AnnotationParameter.java"); doTest(fileName); } @TestMetadata("Class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Class.java"); doTest(fileName); } @TestMetadata("ClassMembers.java") public void testClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassMembers.java"); doTest(fileName); } @TestMetadata("ClassObject.java") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObject.java"); doTest(fileName); } @TestMetadata("ClassObjectField.java") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassObjectField.java"); doTest(fileName); } @TestMetadata("ClassesFromNamespace.java") public void testClassesFromNamespace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ClassesFromNamespace.java"); doTest(fileName); } @TestMetadata("EnumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/EnumConstants.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImpl.java") public void testInterfaceDefaultImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImpl.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplImportedMembers.java") public void testInterfaceDefaultImplImportedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplImportedMembers.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplMembers.java") public void testInterfaceDefaultImplMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplMembers.java"); doTest(fileName); } @TestMetadata("InterfaceDefaultImplStaticImportedMembers.java") public void testInterfaceDefaultImplStaticImportedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/InterfaceDefaultImplStaticImportedMembers.java"); doTest(fileName); } @TestMetadata("MultiFileFacade.java") public void testMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacade.java"); doTest(fileName); } @TestMetadata("MultiFileFacadeMembers.java") public void testMultiFileFacadeMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeMembers.java"); doTest(fileName); } @TestMetadata("MultiFileFacadeNoImport.java") public void testMultiFileFacadeNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/MultiFileFacadeNoImport.java"); doTest(fileName); } @TestMetadata("Nested.java") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Nested.java"); doTest(fileName); } @TestMetadata("NestedClassMembers.java") public void testNestedClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers.java"); doTest(fileName); } @TestMetadata("NestedClassMembers2.java") public void testNestedClassMembers2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedClassMembers2.java"); doTest(fileName); } @TestMetadata("NestedObjectInstance.java") public void testNestedObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/NestedObjectInstance.java"); doTest(fileName); } @TestMetadata("ObjectInClassObjects.java") public void testObjectInClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInClassObjects.java"); doTest(fileName); } @TestMetadata("ObjectInstance.java") public void testObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/ObjectInstance.java"); doTest(fileName); } @TestMetadata("RenamedFacade.java") public void testRenamedFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/RenamedFacade.java"); doTest(fileName); } @TestMetadata("SingleFileFacade.java") public void testSingleFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacade.java"); doTest(fileName); } @TestMetadata("SingleFileFacadeMembers.java") public void testSingleFileFacadeMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeMembers.java"); doTest(fileName); } @TestMetadata("SingleFileFacadeNoImport.java") public void testSingleFileFacadeNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/SingleFileFacadeNoImport.java"); doTest(fileName); } @TestMetadata("Subpackage.java") public void testSubpackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/Subpackage.java"); doTest(fileName); } @TestMetadata("TopLevelMembers.java") public void testTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TopLevelMembers.java"); doTest(fileName); } @TestMetadata("TraitMember.java") public void testTraitMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); doTest(fileName); } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java index 943f79870de..fb6bfd7a74a 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,324 +32,324 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest { public void testAllFilesPresentInMultifile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("CallableReferenceNotImported") public void testCallableReferenceNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImported/"); doTest(fileName); } @TestMetadata("CallableReferenceNotImportedExtension") public void testCallableReferenceNotImportedExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallableReferenceNotImportedExtension/"); doTest(fileName); } @TestMetadata("CallablesInExcludedPackage") public void testCallablesInExcludedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CallablesInExcludedPackage/"); doTest(fileName); } @TestMetadata("ClassInExcludedPackage") public void testClassInExcludedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ClassInExcludedPackage/"); doTest(fileName); } @TestMetadata("CompleteFunctionWithNoSpecifiedType") public void testCompleteFunctionWithNoSpecifiedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteFunctionWithNoSpecifiedType/"); doTest(fileName); } @TestMetadata("CompleteImportedFunction") public void testCompleteImportedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompleteImportedFunction/"); doTest(fileName); } @TestMetadata("CompletionOnImportedFunction") public void testCompletionOnImportedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/CompletionOnImportedFunction/"); doTest(fileName); } @TestMetadata("DoNotCompleteWithConstraints") public void testDoNotCompleteWithConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/DoNotCompleteWithConstraints/"); doTest(fileName); } @TestMetadata("EnumEntry") public void testEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EnumEntry/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/EnumEntry/"); doTest(fileName); } @TestMetadata("ExcludedClass") public void testExcludedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedClass/"); doTest(fileName); } @TestMetadata("ExcludedJavaClass") public void testExcludedJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExcludedJavaClass/"); doTest(fileName); } @TestMetadata("ExtensionFunction") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunction/"); doTest(fileName); } @TestMetadata("ExtensionFunctionOnImportedFunction") public void testExtensionFunctionOnImportedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionFunctionOnImportedFunction/"); doTest(fileName); } @TestMetadata("ExtensionOnNullable") public void testExtensionOnNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionOnNullable/"); doTest(fileName); } @TestMetadata("ExtensionsForSmartCast") public void testExtensionsForSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ExtensionsForSmartCast/"); doTest(fileName); } @TestMetadata("GroovyClassNameCompletionFromDefaultPackage") public void testGroovyClassNameCompletionFromDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/"); doTest(fileName); } @TestMetadata("GroovyClassNameCompletionFromNonDefaultPackage") public void testGroovyClassNameCompletionFromNonDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/"); doTest(fileName); } @TestMetadata("HiddenDeclarations") public void testHiddenDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/HiddenDeclarations/"); doTest(fileName); } @TestMetadata("InImport") public void testInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImport/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImport/"); doTest(fileName); } @TestMetadata("InImportedFunctionLiteralParameter") public void testInImportedFunctionLiteralParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/InImportedFunctionLiteralParameter/"); doTest(fileName); } @TestMetadata("IncorrectGetters") public void testIncorrectGetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/IncorrectGetters/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/IncorrectGetters/"); doTest(fileName); } @TestMetadata("JavaInnerClasses") public void testJavaInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/JavaInnerClasses/"); doTest(fileName); } @TestMetadata("MoreSpecificExtensionGeneric") public void testMoreSpecificExtensionGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionGeneric/"); doTest(fileName); } @TestMetadata("MoreSpecificExtensionInDifferentPackage") public void testMoreSpecificExtensionInDifferentPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionInDifferentPackage/"); doTest(fileName); } @TestMetadata("MoreSpecificExtensionIsPrivate") public void testMoreSpecificExtensionIsPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/MoreSpecificExtensionIsPrivate/"); doTest(fileName); } @TestMetadata("NoAutoInsertionOfNotImported") public void testNoAutoInsertionOfNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoAutoInsertionOfNotImported/"); doTest(fileName); } @TestMetadata("NoExtForOuterFromNested") public void testNoExtForOuterFromNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtForOuterFromNested/"); doTest(fileName); } @TestMetadata("NoExtensionMethodDuplication") public void testNoExtensionMethodDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoExtensionMethodDuplication/"); doTest(fileName); } @TestMetadata("NoGenericFunDuplication") public void testNoGenericFunDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/"); doTest(fileName); } @TestMetadata("NotImportedExtensionForImplicitReceiver") public void testNotImportedExtensionForImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionForImplicitReceiver/"); doTest(fileName); } @TestMetadata("NotImportedExtensionFunction") public void testNotImportedExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction/"); doTest(fileName); } @TestMetadata("NotImportedExtensionFunction2") public void testNotImportedExtensionFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction2/"); doTest(fileName); } @TestMetadata("NotImportedExtensionFunction3") public void testNotImportedExtensionFunction3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunction3/"); doTest(fileName); } @TestMetadata("NotImportedExtensionFunctionAndAlias") public void testNotImportedExtensionFunctionAndAlias() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionFunctionAndAlias/"); doTest(fileName); } @TestMetadata("NotImportedExtensionProperty") public void testNotImportedExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedExtensionProperty/"); doTest(fileName); } @TestMetadata("NotImportedFunction") public void testNotImportedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedFunction/"); doTest(fileName); } @TestMetadata("NotImportedInfixExtension") public void testNotImportedInfixExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/"); doTest(fileName); } @TestMetadata("NotImportedJavaClass") public void testNotImportedJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedJavaClass/"); doTest(fileName); } @TestMetadata("NotImportedObject") public void testNotImportedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedObject/"); doTest(fileName); } @TestMetadata("NotImportedProperty") public void testNotImportedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/NotImportedProperty/"); doTest(fileName); } @TestMetadata("ObjectInTypePosition") public void testObjectInTypePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ObjectInTypePosition/"); doTest(fileName); } @TestMetadata("ParameterNameAndTypeNestedClasses") public void testParameterNameAndTypeNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/"); doTest(fileName); } @TestMetadata("PreferMemberToExtension") public void testPreferMemberToExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToExtension/"); doTest(fileName); } @TestMetadata("PreferMemberToGlobal") public void testPreferMemberToGlobal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMemberToGlobal/"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtension1") public void testPreferMoreSpecificExtension1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension1/"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtension2") public void testPreferMoreSpecificExtension2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension2/"); doTest(fileName); } @TestMetadata("PreferMoreSpecificExtension3") public void testPreferMoreSpecificExtension3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PreferMoreSpecificExtension3/"); doTest(fileName); } @TestMetadata("PropertyKeysEmptyString") public void testPropertyKeysEmptyString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysEmptyString/"); doTest(fileName); } @TestMetadata("PropertyKeysNoPrefix") public void testPropertyKeysNoPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysNoPrefix/"); doTest(fileName); } @TestMetadata("PropertyKeysWithPrefix") public void testPropertyKeysWithPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/PropertyKeysWithPrefix/"); doTest(fileName); } @TestMetadata("SyntheticExtensionDeprecated") public void testSyntheticExtensionDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionDeprecated/"); doTest(fileName); } @TestMetadata("SyntheticExtensionForGenericClass") public void testSyntheticExtensionForGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/SyntheticExtensionForGenericClass/"); doTest(fileName); } @TestMetadata("TopLevelFunction") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TopLevelFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/multifile/TopLevelFunction/"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java index b70e6b9ad01..6b3b440230c 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/MultiFileSmartCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,108 +32,108 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class MultiFileSmartCompletionTestGenerated extends AbstractMultiFileSmartCompletionTest { public void testAllFilesPresentInSmartMultiFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smartMultiFile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/smartMultiFile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("AnonymousObjectGenericJava") public void testAnonymousObjectGenericJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/AnonymousObjectGenericJava/"); doTest(fileName); } @TestMetadata("CallableReferenceNotImported") public void testCallableReferenceNotImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallableReferenceNotImported/"); doTest(fileName); } @TestMetadata("CallablesInExcludedPackage") public void testCallablesInExcludedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/CallablesInExcludedPackage/"); doTest(fileName); } @TestMetadata("FunctionFromAnotherPackage") public void testFunctionFromAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/FunctionFromAnotherPackage/"); doTest(fileName); } @TestMetadata("GenericInheritors1") public void testGenericInheritors1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors1/"); doTest(fileName); } @TestMetadata("GenericInheritors2") public void testGenericInheritors2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors2/"); doTest(fileName); } @TestMetadata("GenericInheritors3") public void testGenericInheritors3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors3/"); doTest(fileName); } @TestMetadata("GenericInheritors4") public void testGenericInheritors4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/GenericInheritors4/"); doTest(fileName); } @TestMetadata("InheritorInTheSameFile") public void testInheritorInTheSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorInTheSameFile/"); doTest(fileName); } @TestMetadata("Inheritors") public void testInheritors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/Inheritors/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/Inheritors/"); doTest(fileName); } @TestMetadata("InheritorsAndMultipleExpectedTypes") public void testInheritorsAndMultipleExpectedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/InheritorsAndMultipleExpectedTypes/"); doTest(fileName); } @TestMetadata("JavaStaticMethodArgument") public void testJavaStaticMethodArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument/"); doTest(fileName); } @TestMetadata("JavaStaticMethodArgument2") public void testJavaStaticMethodArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/JavaStaticMethodArgument2/"); doTest(fileName); } @TestMetadata("KT_8751") public void testKT_8751() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751/"); doTest(fileName); } @TestMetadata("KT_8751_2") public void testKT_8751_2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/KT_8751_2/"); doTest(fileName); } @TestMetadata("NestedClassAfterAs") public void testNestedClassAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NestedClassAfterAs/"); doTest(fileName); } @TestMetadata("NoObjectDuplication") public void testNoObjectDuplication() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/smartMultiFile/NoObjectDuplication/"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt index 71bb3f0256f..d9d60616623 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.codeStyle.CodeStyleSettingsManager import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.utils.addToStdlib.indexOfOrNull import java.io.File @@ -80,7 +80,7 @@ public abstract class AbstractCompletionHandlerTest(private val defaultCompletio fixture.configureByFile(testPath) } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } public abstract class AbstractBasicCompletionHandlerTest() : AbstractCompletionHandlerTest(CompletionType.BASIC) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java index cae9bc3247b..c8c53396886 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/BasicCompletionHandlerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,132 +32,132 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationInBrackets.kt") public void testAnnotationInBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInBrackets.kt"); doTest(fileName); } @TestMetadata("AnnotationInClassAddImport.kt") public void testAnnotationInClassAddImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInClassAddImport.kt"); doTest(fileName); } @TestMetadata("AnnotationInCompanionObjectAddImport.kt") public void testAnnotationInCompanionObjectAddImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/AnnotationInCompanionObjectAddImport.kt"); doTest(fileName); } @TestMetadata("ClassWithClassObject.kt") public void testClassWithClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt"); doTest(fileName); } @TestMetadata("DoNotUseParenthesisOnNextLine.kt") public void testDoNotUseParenthesisOnNextLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt"); doTest(fileName); } @TestMetadata("EA70229.kt") public void testEA70229() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/EA70229.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/EA70229.kt"); doTest(fileName); } @TestMetadata("ExtensionReceiverTypeArg.kt") public void testExtensionReceiverTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExtensionReceiverTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ExtensionReceiverTypeArg.kt"); doTest(fileName); } @TestMetadata("FirstTypeArgument.kt") public void testFirstTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/FirstTypeArgument.kt"); doTest(fileName); } @TestMetadata("GenericFunctionWithTab.kt") public void testGenericFunctionWithTab() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt"); doTest(fileName); } @TestMetadata("GenericFunctionWithTab2.kt") public void testGenericFunctionWithTab2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt"); doTest(fileName); } @TestMetadata("InterfaceNameBeforeRunBug.kt") public void testInterfaceNameBeforeRunBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/InterfaceNameBeforeRunBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/InterfaceNameBeforeRunBug.kt"); doTest(fileName); } @TestMetadata("NestedTypeArg.kt") public void testNestedTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NestedTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NestedTypeArg.kt"); doTest(fileName); } @TestMetadata("NoTailFromSmart.kt") public void testNoTailFromSmart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NoTailFromSmart.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/NoTailFromSmart.kt"); doTest(fileName); } @TestMetadata("PreferMatchingKeyword.kt") public void testPreferMatchingKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PreferMatchingKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/PreferMatchingKeyword.kt"); doTest(fileName); } @TestMetadata("ReplaceFunctionCallByProperty.kt") public void testReplaceFunctionCallByProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByProperty.kt"); doTest(fileName); } @TestMetadata("ReplaceFunctionCallByPropertyArgs.kt") public void testReplaceFunctionCallByPropertyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt"); doTest(fileName); } @TestMetadata("SecondTypeArg.kt") public void testSecondTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SecondTypeArg.kt"); doTest(fileName); } @TestMetadata("SpaceAfterParenthesisBug.kt") public void testSpaceAfterParenthesisBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SpaceAfterParenthesisBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SpaceAfterParenthesisBug.kt"); doTest(fileName); } @TestMetadata("SuperTypeArg.kt") public void testSuperTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SuperTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SuperTypeArg.kt"); doTest(fileName); } @TestMetadata("SyntheticExtension.kt") public void testSyntheticExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SyntheticExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/SyntheticExtension.kt"); doTest(fileName); } @TestMetadata("TypeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/TypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/TypeParameter.kt"); doTest(fileName); } @@ -166,36 +166,36 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassConstructor.kt") public void testClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt"); doTest(fileName); } @TestMetadata("EmptyQualifier.kt") public void testEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/EmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/EmptyQualifier.kt"); doTest(fileName); } @TestMetadata("NonEmptyQualifier.kt") public void testNonEmptyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NonEmptyQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NonEmptyQualifier.kt"); doTest(fileName); } @TestMetadata("NotImportedTopLevel.kt") public void testNotImportedTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NotImportedTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/NotImportedTopLevel.kt"); doTest(fileName); } @TestMetadata("Property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/Property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/callableReference/Property.kt"); doTest(fileName); } } @@ -206,36 +206,36 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion public static class ExclChar extends AbstractBasicCompletionHandlerTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/4.kt"); doTest(fileName); } @TestMetadata("5.kt") public void test5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/exclChar/5.kt"); doTest(fileName); } public void testAllFilesPresentInExclChar() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/exclChar"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/exclChar"), Pattern.compile("^(.+)\\.kt$"), true); } } @@ -244,114 +244,114 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class HighOrderFunctions extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInHighOrderFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/highOrderFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ContextVariable.kt") public void testContextVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariable.kt"); doTest(fileName); } @TestMetadata("ContextVariableDot.kt") public void testContextVariableDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableDot.kt"); doTest(fileName); } @TestMetadata("ContextVariableTypeArgsNeeded.kt") public void testContextVariableTypeArgsNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableTypeArgsNeeded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ContextVariableTypeArgsNeeded.kt"); doTest(fileName); } @TestMetadata("ForceParenthesisForTabChar.kt") public void testForceParenthesisForTabChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ForceParenthesisForTabChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ForceParenthesisForTabChar.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralInsertOnSpace.kt") public void testFunctionLiteralInsertOnSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertOnSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertOnSpace.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralInsertWhenNoSpacesForBraces.kt") public void testFunctionLiteralInsertWhenNoSpacesForBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunction.kt") public void testHigherOrderFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunction.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunctionWithArg.kt") public void testHigherOrderFunctionWithArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunctionWithArgs1.kt") public void testHigherOrderFunctionWithArgs1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs1.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunctionWithArgs2.kt") public void testHigherOrderFunctionWithArgs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs2.kt"); doTest(fileName); } @TestMetadata("HigherOrderFunctionWithArgs3.kt") public void testHigherOrderFunctionWithArgs3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArgs3.kt"); doTest(fileName); } @TestMetadata("InsertFunctionWithSingleParameterWithBrace.kt") public void testInsertFunctionWithSingleParameterWithBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/InsertFunctionWithSingleParameterWithBrace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/InsertFunctionWithSingleParameterWithBrace.kt"); doTest(fileName); } @TestMetadata("OptionalParameters1.kt") public void testOptionalParameters1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters1.kt"); doTest(fileName); } @TestMetadata("OptionalParameters2.kt") public void testOptionalParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/OptionalParameters2.kt"); doTest(fileName); } @TestMetadata("ParameterTypeIsDerivedFromFunction.kt") public void testParameterTypeIsDerivedFromFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt"); doTest(fileName); } @TestMetadata("ReplaceByLambdaTemplateNoClosingParenth.kt") public void testReplaceByLambdaTemplateNoClosingParenth() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/ReplaceByLambdaTemplateNoClosingParenth.kt"); doTest(fileName); } @TestMetadata("WithArgsEmptyLambdaAfter.kt") public void testWithArgsEmptyLambdaAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsEmptyLambdaAfter.kt"); doTest(fileName); } @TestMetadata("WithArgsNonEmptyLambdaAfter.kt") public void testWithArgsNonEmptyLambdaAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/highOrderFunctions/WithArgsNonEmptyLambdaAfter.kt"); doTest(fileName); } } @@ -361,90 +361,90 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/override"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/override"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ImplementFunction.kt") public void testImplementFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementFunction.kt"); doTest(fileName); } @TestMetadata("ImplementVal.kt") public void testImplementVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVal.kt"); doTest(fileName); } @TestMetadata("ImplementVar.kt") public void testImplementVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ImplementVar.kt"); doTest(fileName); } @TestMetadata("KeepAnnotationBefore.kt") public void testKeepAnnotationBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepAnnotationBefore.kt"); doTest(fileName); } @TestMetadata("KeepModifiersBefore.kt") public void testKeepModifiersBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/KeepModifiersBefore.kt"); doTest(fileName); } @TestMetadata("OverrideFunction.kt") public void testOverrideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideFunction.kt"); doTest(fileName); } @TestMetadata("OverrideVar.kt") public void testOverrideVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/OverrideVar.kt"); doTest(fileName); } @TestMetadata("PublicValInConstructorParameter.kt") public void testPublicValInConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/PublicValInConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/PublicValInConstructorParameter.kt"); doTest(fileName); } @TestMetadata("TypeFunctionName.kt") public void testTypeFunctionName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeFunctionName.kt"); doTest(fileName); } @TestMetadata("TypeNameInConstructorParameter.kt") public void testTypeNameInConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeNameInConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/TypeNameInConstructorParameter.kt"); doTest(fileName); } @TestMetadata("ValInConstructorParameter.kt") public void testValInConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter.kt"); doTest(fileName); } @TestMetadata("ValInConstructorParameter2.kt") public void testValInConstructorParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter2.kt"); doTest(fileName); } @TestMetadata("ValInConstructorParameter3.kt") public void testValInConstructorParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter3.kt"); doTest(fileName); } @TestMetadata("ValInConstructorParameter4.kt") public void testValInConstructorParameter4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/override/ValInConstructorParameter4.kt"); doTest(fileName); } } @@ -454,66 +454,66 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class ParameterNameAndType extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInParameterNameAndType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/parameterNameAndType"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CodeStyleSettings.kt") public void testCodeStyleSettings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt"); doTest(fileName); } @TestMetadata("Comma.kt") public void testComma() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt"); doTest(fileName); } @TestMetadata("InsertImport.kt") public void testInsertImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt"); doTest(fileName); } @TestMetadata("NoInsertionOnTypingColon.kt") public void testNoInsertionOnTypingColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingColon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingColon.kt"); doTest(fileName); } @TestMetadata("NoInsertionOnTypingSpace.kt") public void testNoInsertionOnTypingSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/NoInsertionOnTypingSpace.kt"); doTest(fileName); } @TestMetadata("ParameterInFile.kt") public void testParameterInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt"); doTest(fileName); } @TestMetadata("ParameterInFile2.kt") public void testParameterInFile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile2.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt"); doTest(fileName); } @TestMetadata("TypeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt"); doTest(fileName); } @TestMetadata("UserPrefix.kt") public void testUserPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt"); doTest(fileName); } } @@ -524,41 +524,41 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion public static class StringTemplate extends AbstractBasicCompletionHandlerTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt"); doTest(fileName); } public void testAllFilesPresentInStringTemplate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotEmptyPrefix.kt") public void testNotEmptyPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/NotEmptyPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/NotEmptyPrefix.kt"); doTest(fileName); } @TestMetadata("Replace.kt") public void testReplace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/Replace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/stringTemplate/Replace.kt"); doTest(fileName); } } @@ -568,72 +568,72 @@ public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class TypeArgsForCall extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInTypeArgsForCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/typeArgsForCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/basic/typeArgsForCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExpectedTypeDoesNotHelp.kt") public void testExpectedTypeDoesNotHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp.kt"); doTest(fileName); } @TestMetadata("ExpectedTypeDoesNotHelp2.kt") public void testExpectedTypeDoesNotHelp2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExpectedTypeDoesNotHelp2.kt"); doTest(fileName); } @TestMetadata("ExplicitLambdaSignature.kt") public void testExplicitLambdaSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExplicitLambdaSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ExplicitLambdaSignature.kt"); doTest(fileName); } @TestMetadata("FunctionTypeParameter1.kt") public void testFunctionTypeParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter1.kt"); doTest(fileName); } @TestMetadata("FunctionTypeParameter2.kt") public void testFunctionTypeParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/FunctionTypeParameter2.kt"); doTest(fileName); } @TestMetadata("HasExpectedType.kt") public void testHasExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt"); doTest(fileName); } @TestMetadata("NotAllTypeArgumentsFromParameters.kt") public void testNotAllTypeArgumentsFromParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/NotAllTypeArgumentsFromParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/NotAllTypeArgumentsFromParameters.kt"); doTest(fileName); } @TestMetadata("ReplaceByTab1.kt") public void testReplaceByTab1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab1.kt"); doTest(fileName); } @TestMetadata("ReplaceByTab2.kt") public void testReplaceByTab2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/Simple.kt"); doTest(fileName); } @TestMetadata("TypeArgumentsFromParameters.kt") public void testTypeArgumentsFromParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java index 34b2b6456b9..5a456415930 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionCharFilterTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,174 +32,174 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompletionCharFilterTestGenerated extends AbstractCompletionCharFilterTest { public void testAllFilesPresentInCharFilter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/charFilter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/charFilter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Colon.kt") public void testColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Colon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Colon.kt"); doTest(fileName); } @TestMetadata("Comma1.kt") public void testComma1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma1.kt"); doTest(fileName); } @TestMetadata("Comma2.kt") public void testComma2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma2.kt"); doTest(fileName); } @TestMetadata("Comma3.kt") public void testComma3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma3.kt"); doTest(fileName); } @TestMetadata("Comma4.kt") public void testComma4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma4.kt"); doTest(fileName); } @TestMetadata("Comma5.kt") public void testComma5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Comma5.kt"); doTest(fileName); } @TestMetadata("CommaForFunction1.kt") public void testCommaForFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction1.kt"); doTest(fileName); } @TestMetadata("CommaForFunction2.kt") public void testCommaForFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/CommaForFunction2.kt"); doTest(fileName); } @TestMetadata("ConstructorWithLambdaArg1.kt") public void testConstructorWithLambdaArg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg1.kt"); doTest(fileName); } @TestMetadata("ConstructorWithLambdaArg2.kt") public void testConstructorWithLambdaArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/ConstructorWithLambdaArg2.kt"); doTest(fileName); } @TestMetadata("Dot.kt") public void testDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Dot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Dot.kt"); doTest(fileName); } @TestMetadata("DotAfterFun1.kt") public void testDotAfterFun1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun1.kt"); doTest(fileName); } @TestMetadata("DotAfterFun2.kt") public void testDotAfterFun2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/DotAfterFun2.kt"); doTest(fileName); } @TestMetadata("Eq1.kt") public void testEq1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq1.kt"); doTest(fileName); } @TestMetadata("Eq2.kt") public void testEq2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Eq2.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralParameter1.kt") public void testFunctionLiteralParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter1.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralParameter2.kt") public void testFunctionLiteralParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter2.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralParameter3.kt") public void testFunctionLiteralParameter3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionLiteralParameter3.kt"); doTest(fileName); } @TestMetadata("FunctionWithLambdaArg1.kt") public void testFunctionWithLambdaArg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg1.kt"); doTest(fileName); } @TestMetadata("FunctionWithLambdaArg2.kt") public void testFunctionWithLambdaArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/FunctionWithLambdaArg2.kt"); doTest(fileName); } @TestMetadata("InfixCallAndSpace.kt") public void testInfixCallAndSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/InfixCallAndSpace.kt"); doTest(fileName); } @TestMetadata("KeywordAndSpace.kt") public void testKeywordAndSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/KeywordAndSpace.kt"); doTest(fileName); } @TestMetadata("LParenth.kt") public void testLParenth() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/LParenth.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/LParenth.kt"); doTest(fileName); } @TestMetadata("NamedParameter1.kt") public void testNamedParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter1.kt"); doTest(fileName); } @TestMetadata("NamedParameter2.kt") public void testNamedParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/NamedParameter2.kt"); doTest(fileName); } @TestMetadata("QualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/QualifiedThis.kt"); doTest(fileName); } @TestMetadata("RangeTyping.kt") public void testRangeTyping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/RangeTyping.kt"); doTest(fileName); } @TestMetadata("Space.kt") public void testSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Space.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/charFilter/Space.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt index fee8cfb835b..dd9aeaa8749 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/CompletionHandlerTestBase.kt @@ -26,11 +26,11 @@ import com.intellij.openapi.application.Result import com.intellij.openapi.command.WriteCommandAction import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.test.KotlinTestUtils import kotlin.test.fail -public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTestCase() { +public abstract class CompletionHandlerTestBase() : KotlinLightCodeInsightFixtureTestCase() { protected val fixture: JavaCodeInsightTestFixture get() = myFixture @@ -109,7 +109,7 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe return foundElement } - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() protected fun selectItem(item: LookupElement?, completionChar: Char) { val lookup = (fixture.getLookup() as LookupImpl) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java index 53e6a232aa2..4af5d9035d1 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/KeywordCompletionHandlerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,137 +33,137 @@ import java.util.regex.Pattern; public class KeywordCompletionHandlerTestGenerated extends AbstractKeywordCompletionHandlerTest { @TestMetadata("AddCompanionToObject.kt") public void testAddCompanionToObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/AddCompanionToObject.kt"); doTest(fileName); } public void testAllFilesPresentInKeywords() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/keywords"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/keywords"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Break.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Break.kt"); doTest(fileName); } @TestMetadata("CompanionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/CompanionObject.kt"); doTest(fileName); } @TestMetadata("FileKeyword.kt") public void testFileKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/FileKeyword.kt"); doTest(fileName); } @TestMetadata("Getter1.kt") public void testGetter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter1.kt"); doTest(fileName); } @TestMetadata("Getter2.kt") public void testGetter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Getter2.kt"); doTest(fileName); } @TestMetadata("NoSpaceAfterNull.kt") public void testNoSpaceAfterNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/NoSpaceAfterNull.kt"); doTest(fileName); } @TestMetadata("QualifiedReturnNonUnit.kt") public void testQualifiedReturnNonUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnit.kt"); doTest(fileName); } @TestMetadata("QualifiedReturnNonUnitExplicit.kt") public void testQualifiedReturnNonUnitExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnNonUnitExplicit.kt"); doTest(fileName); } @TestMetadata("QualifiedReturnUnit.kt") public void testQualifiedReturnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/QualifiedReturnUnit.kt"); doTest(fileName); } @TestMetadata("ReturnEmptyList.kt") public void testReturnEmptyList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnEmptyList.kt"); doTest(fileName); } @TestMetadata("ReturnInEmptyType.kt") public void testReturnInEmptyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInEmptyType.kt"); doTest(fileName); } @TestMetadata("ReturnInProperty.kt") public void testReturnInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInProperty.kt"); doTest(fileName); } @TestMetadata("ReturnInTypeFunction.kt") public void testReturnInTypeFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInTypeFunction.kt"); doTest(fileName); } @TestMetadata("ReturnInUnit.kt") public void testReturnInUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnInUnit.kt"); doTest(fileName); } @TestMetadata("ReturnNull.kt") public void testReturnNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/ReturnNull.kt"); doTest(fileName); } @TestMetadata("Setter1.kt") public void testSetter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter1.kt"); doTest(fileName); } @TestMetadata("Setter2.kt") public void testSetter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/Setter2.kt"); doTest(fileName); } @TestMetadata("SpaceAfterImport.kt") public void testSpaceAfterImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/SpaceAfterImport.kt"); doTest(fileName); } @TestMetadata("UseSiteAnnotationTarget1.kt") public void testUseSiteAnnotationTarget1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget1.kt"); doTest(fileName); } @TestMetadata("UseSiteAnnotationTarget2.kt") public void testUseSiteAnnotationTarget2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget2.kt"); doTest(fileName); } @TestMetadata("UseSiteAnnotationTarget3.kt") public void testUseSiteAnnotationTarget3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/keywords/UseSiteAnnotationTarget3.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java index ffdefa076f9..f4d248ab1f3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.handlers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,839 +33,839 @@ import java.util.regex.Pattern; public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs.kt"); doTest(fileName); } @TestMetadata("AfterAs2.kt") public void testAfterAs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs2.kt"); doTest(fileName); } @TestMetadata("AfterAs3.kt") public void testAfterAs3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterAs3.kt"); doTest(fileName); } @TestMetadata("AfterSafeAs.kt") public void testAfterSafeAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterSafeAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterSafeAs.kt"); doTest(fileName); } @TestMetadata("AfterVararg.kt") public void testAfterVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AfterVararg.kt"); doTest(fileName); } public void testAllFilesPresentInSmart() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousObject1.kt") public void testAnonymousObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject1.kt"); doTest(fileName); } @TestMetadata("AnonymousObject2.kt") public void testAnonymousObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject2.kt"); doTest(fileName); } @TestMetadata("AnonymousObject3.kt") public void testAnonymousObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObject3.kt"); doTest(fileName); } @TestMetadata("AnonymousObjectInsertsImport.kt") public void testAnonymousObjectInsertsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectInsertsImport.kt"); doTest(fileName); } @TestMetadata("AnonymousObjectUninferredTypeArgs.kt") public void testAnonymousObjectUninferredTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AnonymousObjectUninferredTypeArgs.kt"); doTest(fileName); } @TestMetadata("AutoCompleteAfterAs1.kt") public void testAutoCompleteAfterAs1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs1.kt"); doTest(fileName); } @TestMetadata("AutoCompleteAfterAs2.kt") public void testAutoCompleteAfterAs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs2.kt"); doTest(fileName); } @TestMetadata("AutoCompleteAfterAs3.kt") public void testAutoCompleteAfterAs3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/AutoCompleteAfterAs3.kt"); doTest(fileName); } @TestMetadata("CallableReference1.kt") public void testCallableReference1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference1.kt"); doTest(fileName); } @TestMetadata("CallableReference2.kt") public void testCallableReference2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference2.kt"); doTest(fileName); } @TestMetadata("CallableReference3.kt") public void testCallableReference3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference3.kt"); doTest(fileName); } @TestMetadata("CallableReference4.kt") public void testCallableReference4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CallableReference4.kt"); doTest(fileName); } @TestMetadata("ClassInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassInObject.kt") public void testClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassInObject.kt"); doTest(fileName); } @TestMetadata("ClassObjectFieldKeywordName.kt") public void testClassObjectFieldKeywordName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectFieldKeywordName.kt"); doTest(fileName); } @TestMetadata("ClassObjectMethod1.kt") public void testClassObjectMethod1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod1.kt"); doTest(fileName); } @TestMetadata("ClassObjectMethod2.kt") public void testClassObjectMethod2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod2.kt"); doTest(fileName); } @TestMetadata("ClassObjectMethod3.kt") public void testClassObjectMethod3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod3.kt"); doTest(fileName); } @TestMetadata("ClassObjectMethod4.kt") public void testClassObjectMethod4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClassObjectMethod4.kt"); doTest(fileName); } @TestMetadata("ClosingParenthesis1.kt") public void testClosingParenthesis1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis1.kt"); doTest(fileName); } @TestMetadata("ClosingParenthesis2.kt") public void testClosingParenthesis2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ClosingParenthesis2.kt"); doTest(fileName); } @TestMetadata("Comma1.kt") public void testComma1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma1.kt"); doTest(fileName); } @TestMetadata("Comma10.kt") public void testComma10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma10.kt"); doTest(fileName); } @TestMetadata("Comma11.kt") public void testComma11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma11.kt"); doTest(fileName); } @TestMetadata("Comma2.kt") public void testComma2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma2.kt"); doTest(fileName); } @TestMetadata("Comma3.kt") public void testComma3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma3.kt"); doTest(fileName); } @TestMetadata("Comma4.kt") public void testComma4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma4.kt"); doTest(fileName); } @TestMetadata("Comma5.kt") public void testComma5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma5.kt"); doTest(fileName); } @TestMetadata("Comma6.kt") public void testComma6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma6.kt"); doTest(fileName); } @TestMetadata("Comma7.kt") public void testComma7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma7.kt"); doTest(fileName); } @TestMetadata("Comma8.kt") public void testComma8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma8.kt"); doTest(fileName); } @TestMetadata("Comma9.kt") public void testComma9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Comma9.kt"); doTest(fileName); } @TestMetadata("CommaInSuperConstructorCall.kt") public void testCommaInSuperConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CommaInSuperConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/CommaInSuperConstructorCall.kt"); doTest(fileName); } @TestMetadata("ConcreteJavaClass.kt") public void testConcreteJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass.kt"); doTest(fileName); } @TestMetadata("ConcreteJavaClass2.kt") public void testConcreteJavaClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteJavaClass2.kt"); doTest(fileName); } @TestMetadata("ConcreteKClass.kt") public void testConcreteKClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteKClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConcreteKClass.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Constructor.kt"); doTest(fileName); } @TestMetadata("ConstructorForGenericType.kt") public void testConstructorForGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType.kt"); doTest(fileName); } @TestMetadata("ConstructorForGenericType2.kt") public void testConstructorForGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForGenericType2.kt"); doTest(fileName); } @TestMetadata("ConstructorForJavaClass.kt") public void testConstructorForJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForJavaClass.kt"); doTest(fileName); } @TestMetadata("ConstructorForNullable.kt") public void testConstructorForNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorForNullable.kt"); doTest(fileName); } @TestMetadata("ConstructorInsertsImport.kt") public void testConstructorInsertsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport.kt"); doTest(fileName); } @TestMetadata("ConstructorInsertsImport2.kt") public void testConstructorInsertsImport2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorInsertsImport2.kt"); doTest(fileName); } @TestMetadata("ConstructorWithKeywordName.kt") public void testConstructorWithKeywordName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithKeywordName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithKeywordName.kt"); doTest(fileName); } @TestMetadata("ConstructorWithLambdaParameter1.kt") public void testConstructorWithLambdaParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter1.kt"); doTest(fileName); } @TestMetadata("ConstructorWithLambdaParameter2.kt") public void testConstructorWithLambdaParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithLambdaParameter2.kt"); doTest(fileName); } @TestMetadata("ConstructorWithParameters.kt") public void testConstructorWithParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ConstructorWithParameters.kt"); doTest(fileName); } @TestMetadata("DefaultParams.kt") public void testDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DefaultParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DefaultParams.kt"); doTest(fileName); } @TestMetadata("DoNotEraseBraceOnTab.kt") public void testDoNotEraseBraceOnTab() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotEraseBraceOnTab.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotEraseBraceOnTab.kt"); doTest(fileName); } @TestMetadata("DoNotInsertTypeArguments.kt") public void testDoNotInsertTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotInsertTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotInsertTypeArguments.kt"); doTest(fileName); } @TestMetadata("DoNotReplaceOnEnter.kt") public void testDoNotReplaceOnEnter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotReplaceOnEnter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/DoNotReplaceOnEnter.kt"); doTest(fileName); } @TestMetadata("EnumMember.kt") public void testEnumMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/EnumMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/EnumMember.kt"); doTest(fileName); } @TestMetadata("ExclChar.kt") public void testExclChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ExclChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ExclChar.kt"); doTest(fileName); } @TestMetadata("ForLoopRange.kt") public void testForLoopRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange.kt"); doTest(fileName); } @TestMetadata("ForLoopRange2.kt") public void testForLoopRange2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ForLoopRange2.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralParamAlreadyExist.kt") public void testFunctionLiteralParamAlreadyExist() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/FunctionLiteralParamAlreadyExist.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/FunctionLiteralParamAlreadyExist.kt"); doTest(fileName); } @TestMetadata("GenericFunction.kt") public void testGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GenericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GenericFunction.kt"); doTest(fileName); } @TestMetadata("GetWithBrackets.kt") public void testGetWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GetWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/GetWithBrackets.kt"); doTest(fileName); } @TestMetadata("IfCondition.kt") public void testIfCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfCondition.kt"); doTest(fileName); } @TestMetadata("IfValue1.kt") public void testIfValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue1.kt"); doTest(fileName); } @TestMetadata("IfValue2.kt") public void testIfValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue2.kt"); doTest(fileName); } @TestMetadata("IfValue3.kt") public void testIfValue3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValue3.kt"); doTest(fileName); } @TestMetadata("IfValueInBlock.kt") public void testIfValueInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValueInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/IfValueInBlock.kt"); doTest(fileName); } @TestMetadata("InElvisOperator.kt") public void testInElvisOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InElvisOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InElvisOperator.kt"); doTest(fileName); } @TestMetadata("InnerClassInstantiation1.kt") public void testInnerClassInstantiation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation1.kt"); doTest(fileName); } @TestMetadata("InnerClassInstantiation2.kt") public void testInnerClassInstantiation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InnerClassInstantiation2.kt"); doTest(fileName); } @TestMetadata("InsertTypeArguments.kt") public void testInsertTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InsertTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/InsertTypeArguments.kt"); doTest(fileName); } @TestMetadata("JavaEnumMemberInsertsImport.kt") public void testJavaEnumMemberInsertsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaEnumMemberInsertsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaEnumMemberInsertsImport.kt"); doTest(fileName); } @TestMetadata("JavaStaticField.kt") public void testJavaStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticField.kt"); doTest(fileName); } @TestMetadata("JavaStaticFieldInsertImport.kt") public void testJavaStaticFieldInsertImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticFieldInsertImport.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethod.kt") public void testJavaStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethod.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethodInsertsImport.kt") public void testJavaStaticMethodInsertsImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/JavaStaticMethodInsertsImport.kt"); doTest(fileName); } @TestMetadata("kt6179filterTo.kt") public void testKt6179filterTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/kt6179filterTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/kt6179filterTo.kt"); doTest(fileName); } @TestMetadata("Lambda1.kt") public void testLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda1.kt"); doTest(fileName); } @TestMetadata("Lambda2.kt") public void testLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda2.kt"); doTest(fileName); } @TestMetadata("Lambda3.kt") public void testLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda3.kt"); doTest(fileName); } @TestMetadata("Lambda4.kt") public void testLambda4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda4.kt"); doTest(fileName); } @TestMetadata("Lambda5.kt") public void testLambda5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Lambda5.kt"); doTest(fileName); } @TestMetadata("LambdaInsertImport.kt") public void testLambdaInsertImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaInsertImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaInsertImport.kt"); doTest(fileName); } @TestMetadata("LambdaValue1.kt") public void testLambdaValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue1.kt"); doTest(fileName); } @TestMetadata("LambdaValue2.kt") public void testLambdaValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LambdaValue2.kt"); doTest(fileName); } @TestMetadata("LastNonOptionalParamIsFunction.kt") public void testLastNonOptionalParamIsFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastNonOptionalParamIsFunction.kt"); doTest(fileName); } @TestMetadata("LastParamIsFunction.kt") public void testLastParamIsFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastParamIsFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/LastParamIsFunction.kt"); doTest(fileName); } @TestMetadata("MergeTail1.kt") public void testMergeTail1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail1.kt"); doTest(fileName); } @TestMetadata("MergeTail2.kt") public void testMergeTail2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail2.kt"); doTest(fileName); } @TestMetadata("MergeTail3.kt") public void testMergeTail3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail3.kt"); doTest(fileName); } @TestMetadata("MergeTail4.kt") public void testMergeTail4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MergeTail4.kt"); doTest(fileName); } @TestMetadata("MultipleArgsIntoBrackets.kt") public void testMultipleArgsIntoBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsIntoBrackets.kt"); doTest(fileName); } @TestMetadata("MultipleArgsItem.kt") public void testMultipleArgsItem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItem.kt"); doTest(fileName); } @TestMetadata("MultipleArgsItemByTab.kt") public void testMultipleArgsItemByTab() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItemByTab.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/MultipleArgsItemByTab.kt"); doTest(fileName); } @TestMetadata("NamedArgument1.kt") public void testNamedArgument1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument1.kt"); doTest(fileName); } @TestMetadata("NamedArgument2.kt") public void testNamedArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument2.kt"); doTest(fileName); } @TestMetadata("NamedArgument3.kt") public void testNamedArgument3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgument3.kt"); doTest(fileName); } @TestMetadata("NamedArgumentVararg1.kt") public void testNamedArgumentVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg1.kt"); doTest(fileName); } @TestMetadata("NamedArgumentVararg2.kt") public void testNamedArgumentVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg2.kt"); doTest(fileName); } @TestMetadata("NamedArgumentVararg3.kt") public void testNamedArgumentVararg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NamedArgumentVararg3.kt"); doTest(fileName); } @TestMetadata("NestedDataClass.kt") public void testNestedDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClass.kt"); doTest(fileName); } @TestMetadata("NestedDataClassComma.kt") public void testNestedDataClassComma() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClassComma.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NestedDataClassComma.kt"); doTest(fileName); } @TestMetadata("NullableValue1.kt") public void testNullableValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue1.kt"); doTest(fileName); } @TestMetadata("NullableValue2.kt") public void testNullableValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue2.kt"); doTest(fileName); } @TestMetadata("NullableValue3.kt") public void testNullableValue3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValue3.kt"); doTest(fileName); } @TestMetadata("NullableValueKeepOldArguments.kt") public void testNullableValueKeepOldArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValueKeepOldArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/NullableValueKeepOldArguments.kt"); doTest(fileName); } @TestMetadata("ObjectFromType.kt") public void testObjectFromType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ObjectFromType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ObjectFromType.kt"); doTest(fileName); } @TestMetadata("QualifiedCallReplacementBug.kt") public void testQualifiedCallReplacementBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedCallReplacementBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedCallReplacementBug.kt"); doTest(fileName); } @TestMetadata("QualifiedThisKeywordName1.kt") public void testQualifiedThisKeywordName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName1.kt"); doTest(fileName); } @TestMetadata("QualifiedThisKeywordName2.kt") public void testQualifiedThisKeywordName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/QualifiedThisKeywordName2.kt"); doTest(fileName); } @TestMetadata("ReplaceArgument.kt") public void testReplaceArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ReplaceArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/ReplaceArgument.kt"); doTest(fileName); } @TestMetadata("SAMExpected1.kt") public void testSAMExpected1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected1.kt"); doTest(fileName); } @TestMetadata("SAMExpected2.kt") public void testSAMExpected2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SAMExpected2.kt"); doTest(fileName); } @TestMetadata("SecondVararg.kt") public void testSecondVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SecondVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SecondVararg.kt"); doTest(fileName); } @TestMetadata("SetWithBrackets.kt") public void testSetWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SetWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/SetWithBrackets.kt"); doTest(fileName); } @TestMetadata("TabReplaceComma1.kt") public void testTabReplaceComma1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma1.kt"); doTest(fileName); } @TestMetadata("TabReplaceComma2.kt") public void testTabReplaceComma2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceComma2.kt"); doTest(fileName); } @TestMetadata("TabReplaceExpression.kt") public void testTabReplaceExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression.kt"); doTest(fileName); } @TestMetadata("TabReplaceExpression2.kt") public void testTabReplaceExpression2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression2.kt"); doTest(fileName); } @TestMetadata("TabReplaceExpression3.kt") public void testTabReplaceExpression3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression3.kt"); doTest(fileName); } @TestMetadata("TabReplaceExpression4.kt") public void testTabReplaceExpression4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceExpression4.kt"); doTest(fileName); } @TestMetadata("TabReplaceFunctionName1.kt") public void testTabReplaceFunctionName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName1.kt"); doTest(fileName); } @TestMetadata("TabReplaceFunctionName2.kt") public void testTabReplaceFunctionName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName2.kt"); doTest(fileName); } @TestMetadata("TabReplaceFunctionName3.kt") public void testTabReplaceFunctionName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceFunctionName3.kt"); doTest(fileName); } @TestMetadata("TabReplaceIdentifier.kt") public void testTabReplaceIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceIdentifier.kt"); doTest(fileName); } @TestMetadata("TabReplaceOperand.kt") public void testTabReplaceOperand() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceOperand.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TabReplaceOperand.kt"); doTest(fileName); } @TestMetadata("True.kt") public void testTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True.kt"); doTest(fileName); } @TestMetadata("True2.kt") public void testTrue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/True2.kt"); doTest(fileName); } @TestMetadata("TypeParameterAfterAs.kt") public void testTypeParameterAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TypeParameterAfterAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/TypeParameterAfterAs.kt"); doTest(fileName); } @TestMetadata("Vararg1.kt") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg1.kt"); doTest(fileName); } @TestMetadata("Vararg2.kt") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg2.kt"); doTest(fileName); } @TestMetadata("Vararg3.kt") public void testVararg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg3.kt"); doTest(fileName); } @TestMetadata("Vararg4.kt") public void testVararg4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg4.kt"); doTest(fileName); } @TestMetadata("Vararg5.kt") public void testVararg5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg5.kt"); doTest(fileName); } @TestMetadata("Vararg6.kt") public void testVararg6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/Vararg6.kt"); doTest(fileName); } @TestMetadata("VarargAfterStar.kt") public void testVarargAfterStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargAfterStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargAfterStar.kt"); doTest(fileName); } @TestMetadata("VarargWithParameterAfter.kt") public void testVarargWithParameterAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargWithParameterAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/VarargWithParameterAfter.kt"); doTest(fileName); } @TestMetadata("WhenElse.kt") public void testWhenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/WhenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/smart/WhenElse.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/AbstractCompletionWeigherTest.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/AbstractCompletionWeigherTest.kt index 5e079c5d99d..e06f5d34b08 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/AbstractCompletionWeigherTest.kt +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/AbstractCompletionWeigherTest.kt @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.idea.completion.test.weighers import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.kotlin.idea.completion.test.COMPLETION_TEST_DATA_BASE_PATH import org.jetbrains.kotlin.idea.completion.test.RELATIVE_COMPLETION_TEST_DATA_BASE_PATH -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.util.configureWithExtraFile import org.junit.Assert import java.io.File -public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : KotlinLightCodeInsightFixtureTestCase() { fun doTest(path: String) { val pathPrefix = RELATIVE_COMPLETION_TEST_DATA_BASE_PATH + "/" + relativeTestDataPath assert(path.startsWith(pathPrefix)) @@ -49,9 +49,9 @@ public abstract class AbstractCompletionWeigherTest(val completionType: Completi } public abstract class AbstractBasicCompletionWeigherTest() : AbstractCompletionWeigherTest(CompletionType.BASIC, "weighers/basic") { - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE } public abstract class AbstractSmartCompletionWeigherTest() : AbstractCompletionWeigherTest(CompletionType.SMART, "weighers/smart") { - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java index ab30f75efe1..4fc8118f0c3 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.weighers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,113 +33,113 @@ import java.util.regex.Pattern; public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletionWeigherTest { @TestMetadata("AfterNullable.kt") public void testAfterNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/AfterNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/AfterNullable.kt"); doTest(fileName); } public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("Callables.kt") public void testCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Callables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Callables.kt"); doTest(fileName); } @TestMetadata("DeprecatedFun.kt") public void testDeprecatedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedFun.kt"); doTest(fileName); } @TestMetadata("DeprecatedJavaClass.kt") public void testDeprecatedJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/DeprecatedJavaClass.kt"); doTest(fileName); } @TestMetadata("ExactMatchForKeyword.kt") public void testExactMatchForKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ExactMatchForKeyword.kt"); doTest(fileName); } @TestMetadata("ImportedFirst.kt") public void testImportedFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirst.kt"); doTest(fileName); } @TestMetadata("ImportedFirstForJavaClass.kt") public void testImportedFirstForJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedFirstForJavaClass.kt"); doTest(fileName); } @TestMetadata("ImportedOrder.kt") public void testImportedOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ImportedOrder.kt"); doTest(fileName); } @TestMetadata("KeywordsLast.kt") public void testKeywordsLast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/KeywordsLast.kt"); doTest(fileName); } @TestMetadata("LocalFileBeforeImported.kt") public void testLocalFileBeforeImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalFileBeforeImported.kt"); doTest(fileName); } @TestMetadata("LocalValuesAndParams.kt") public void testLocalValuesAndParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalValuesAndParams.kt"); doTest(fileName); } @TestMetadata("LocalsBeforeKeywords.kt") public void testLocalsBeforeKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsBeforeKeywords.kt"); doTest(fileName); } @TestMetadata("LocalsPropertiesKeywords.kt") public void testLocalsPropertiesKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/LocalsPropertiesKeywords.kt"); doTest(fileName); } @TestMetadata("NamedParameters.kt") public void testNamedParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/NamedParameters.kt"); doTest(fileName); } @TestMetadata("Packages.kt") public void testPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Packages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/Packages.kt"); doTest(fileName); } @TestMetadata("ParametersBeforeKeywords.kt") public void testParametersBeforeKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/ParametersBeforeKeywords.kt"); doTest(fileName); } @TestMetadata("PreferFromJdk.kt") public void testPreferFromJdk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PreferFromJdk.kt"); doTest(fileName); } @TestMetadata("PropertiesBeforeKeywords.kt") public void testPropertiesBeforeKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/PropertiesBeforeKeywords.kt"); doTest(fileName); } @@ -149,95 +149,95 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion public static class ExpectedInfo extends AbstractBasicCompletionWeigherTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/AfterAs.kt"); doTest(fileName); } public void testAllFilesPresentInExpectedInfo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/expectedInfo"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/expectedInfo"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("CompanionObjectMethod.kt") public void testCompanionObjectMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/CompanionObjectMethod.kt"); doTest(fileName); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/EnumEntries.kt"); doTest(fileName); } @TestMetadata("ExpectedType.kt") public void testExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType.kt"); doTest(fileName); } @TestMetadata("ExpectedType2.kt") public void testExpectedType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt"); doTest(fileName); } @TestMetadata("LambdaValue.kt") public void testLambdaValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/LambdaValue.kt"); doTest(fileName); } @TestMetadata("MultiArgsItem.kt") public void testMultiArgsItem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/MultiArgsItem.kt"); doTest(fileName); } @TestMetadata("NameSimilarity.kt") public void testNameSimilarity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarity.kt"); doTest(fileName); } @TestMetadata("NameSimilarityAndNoExpectedType.kt") public void testNameSimilarityAndNoExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType.kt"); doTest(fileName); } @TestMetadata("NameSimilarityAndNoExpectedType2.kt") public void testNameSimilarityAndNoExpectedType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NameSimilarityAndNoExpectedType2.kt"); doTest(fileName); } @TestMetadata("NoStupidComparison.kt") public void testNoStupidComparison() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/NoStupidComparison.kt"); doTest(fileName); } @TestMetadata("Null.kt") public void testNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/Null.kt"); doTest(fileName); } @TestMetadata("PreferMatchingThis.kt") public void testPreferMatchingThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/PreferMatchingThis.kt"); doTest(fileName); } @TestMetadata("TrueFalse.kt") public void testTrueFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/TrueFalse.kt"); doTest(fileName); } @TestMetadata("WhenByEnum.kt") public void testWhenByEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/expectedInfo/WhenByEnum.kt"); doTest(fileName); } } @@ -247,48 +247,48 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion @RunWith(JUnit3RunnerWithInners.class) public static class ParameterNameAndType extends AbstractBasicCompletionWeigherTest { public void testAllFilesPresentInParameterNameAndType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/parameterNameAndType"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/basic/parameterNameAndType"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt"); doTest(fileName); } @TestMetadata("FromCurrentFilePriority.kt") public void testFromCurrentFilePriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt"); doTest(fileName); } @TestMetadata("ImportedFirst.kt") public void testImportedFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt"); doTest(fileName); } @TestMetadata("MoreWordsMatchFirst.kt") public void testMoreWordsMatchFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt"); doTest(fileName); } @TestMetadata("ShorterFirst.kt") public void testShorterFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt"); doTest(fileName); } @TestMetadata("StartMatchFirst.kt") public void testStartMatchFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt"); doTest(fileName); } @TestMetadata("UserPrefix.kt") public void testUserPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt"); doTest(fileName); } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java index 6b1ae61e9f8..121722da927 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/SmartCompletionWeigherTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.completion.test.weighers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,204 +32,204 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class SmartCompletionWeigherTestGenerated extends AbstractSmartCompletionWeigherTest { public void testAllFilesPresentInSmart() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/smart"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/weighers/smart"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("BooleanExpected.kt") public void testBooleanExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/BooleanExpected.kt"); doTest(fileName); } @TestMetadata("FunctionExpected.kt") public void testFunctionExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/FunctionExpected.kt"); doTest(fileName); } @TestMetadata("It.kt") public void testIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/It.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/It.kt"); doTest(fileName); } @TestMetadata("MultipleArgsItem.kt") public void testMultipleArgsItem() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/MultipleArgsItem.kt"); doTest(fileName); } @TestMetadata("NameSimilarity1.kt") public void testNameSimilarity1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity1.kt"); doTest(fileName); } @TestMetadata("NameSimilarity2.kt") public void testNameSimilarity2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity2.kt"); doTest(fileName); } @TestMetadata("NameSimilarity3.kt") public void testNameSimilarity3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarity3.kt"); doTest(fileName); } @TestMetadata("NameSimilarityAndCompiledParameters.kt") public void testNameSimilarityAndCompiledParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityAndCompiledParameters.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForAssignment.kt") public void testNameSimilarityForAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForAssignment.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForBlock.kt") public void testNameSimilarityForBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForBlock.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForElse.kt") public void testNameSimilarityForElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElse.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForElvis.kt") public void testNameSimilarityForElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForElvis.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForEq1.kt") public void testNameSimilarityForEq1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq1.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForEq2.kt") public void testNameSimilarityForEq2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq2.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForEq3.kt") public void testNameSimilarityForEq3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq3.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForEq4.kt") public void testNameSimilarityForEq4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForEq4.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForExpressionBody.kt") public void testNameSimilarityForExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForExpressionBody.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForGetterExpressionBody.kt") public void testNameSimilarityForGetterExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterExpressionBody.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForGetterReturn.kt") public void testNameSimilarityForGetterReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForGetterReturn.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForInitializer.kt") public void testNameSimilarityForInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForInitializer.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForReturn.kt") public void testNameSimilarityForReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForReturn.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForThen.kt") public void testNameSimilarityForThen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForThen.kt"); doTest(fileName); } @TestMetadata("NameSimilarityForVararg.kt") public void testNameSimilarityForVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityForVararg.kt"); doTest(fileName); } @TestMetadata("NameSimilarityInImplicitlyTypedVarInitializer.kt") public void testNameSimilarityInImplicitlyTypedVarInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilarityInImplicitlyTypedVarInitializer.kt"); doTest(fileName); } @TestMetadata("NameSimilaritySorterPlacement.kt") public void testNameSimilaritySorterPlacement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NameSimilaritySorterPlacement.kt"); doTest(fileName); } @TestMetadata("NoExpectedType.kt") public void testNoExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoExpectedType.kt"); doTest(fileName); } @TestMetadata("NoNameSimilarityForQualifier.kt") public void testNoNameSimilarityForQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NoNameSimilarityForQualifier.kt"); doTest(fileName); } @TestMetadata("NullableExpected.kt") public void testNullableExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NullableExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/NullableExpected.kt"); doTest(fileName); } @TestMetadata("ReturnValue1.kt") public void testReturnValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue1.kt"); doTest(fileName); } @TestMetadata("ReturnValue2.kt") public void testReturnValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/ReturnValue2.kt"); doTest(fileName); } @TestMetadata("SmartPriority.kt") public void testSmartPriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority.kt"); doTest(fileName); } @TestMetadata("SmartPriority2.kt") public void testSmartPriority2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority2.kt"); doTest(fileName); } @TestMetadata("SmartPriority3.kt") public void testSmartPriority3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/smart/SmartPriority3.kt"); doTest(fileName); } } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java index 760158f0e7b..64ad613989d 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; @@ -27,7 +26,7 @@ import org.jetbrains.kotlin.test.MockLibraryUtil; import java.io.File; -public class JdkAndMockLibraryProjectDescriptor extends JetLightProjectDescriptor { +public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescriptor { public static final String LIBRARY_NAME = "myKotlinLib"; private final String sourcesPath; diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java index 5eca6676619..73ea6a79584 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinCodeInsightTestCase.java @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase { @Override protected void setUp() throws Exception { - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); super.setUp(); } @Override protected void tearDown() throws Exception { super.tearDown(); - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); } } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 3d0f6aea0ae..2ae89e6f0c1 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -88,13 +88,13 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi val testName = StringUtil.toLowerCase(getTestName(false)) if (testName.endsWith("runtime")) { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } else if (testName.endsWith("stdlib")) { return ProjectDescriptorWithStdlibSources.INSTANCE } - return JetLightProjectDescriptor.INSTANCE + return KotlinLightProjectDescriptor.INSTANCE } protected fun getProjectDescriptorFromFileDirective(): LightProjectDescriptor { @@ -110,7 +110,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi return ProjectDescriptorWithStdlibSources.INSTANCE } else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "RUNTIME")) { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } else if (InTextDirectivesUtils.isDirectiveDefined(fileText, "JS")) { return KotlinStdJSProjectDescriptor.instance @@ -121,7 +121,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi } } - return JetLightProjectDescriptor.INSTANCE + return KotlinLightProjectDescriptor.INSTANCE } protected fun isAllFilesPresentInTest(): Boolean diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt index 6e020dc5bc9..568bca23ade 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightPlatformCodeInsightFixtureTestCase.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.startup.StartupManager import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatformCodeInsightFixtureTestCase() { private var kotlinInternalModeOriginalValue: Boolean = false @@ -29,7 +29,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo override fun setUp() { super.setUp() (StartupManager.getInstance(getProject()) as StartupManagerImpl).runPostStartupActivities() - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) invalidateLibraryCache(project) kotlinInternalModeOriginalValue = KotlinInternalMode.enabled @@ -38,7 +38,7 @@ public abstract class KotlinLightPlatformCodeInsightFixtureTestCase: LightPlatfo override fun tearDown() { KotlinInternalMode.enabled = kotlinInternalModeOriginalValue - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) unInvalidateBuiltinsAndStdLib(getProject()) { super.tearDown() diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt index 9a4cbd4fa5d..185465ba848 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.psi.PsiDocumentManager import com.intellij.refactoring.MultiFileTestCase import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils public abstract class KotlinMultiFileTestCase : MultiFileTestCase() { protected fun extractCaretOffset(doc: Document): Int { @@ -45,11 +45,11 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) } override fun tearDown() { - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) super.tearDown() } } \ No newline at end of file diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt index 3e7d6216956..4ee61a21baa 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.test import com.intellij.testFramework.LightProjectDescriptor -public open class KotlinStdJSProjectDescriptor : JetLightProjectDescriptor() { +public open class KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() { companion object { public val instance: KotlinStdJSProjectDescriptor = Class.forName("org.jetbrains.kotlin.test.KotlinStdJSProjectDescriptorImpl").newInstance() as KotlinStdJSProjectDescriptor diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java index 4cf9ab7f316..c1d20120661 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java @@ -20,7 +20,7 @@ import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -32,7 +32,7 @@ public class PluginTestCaseBase { @NotNull public static String getTestDataPathBase() { - return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; + return KotlinTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; } @NotNull diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java index d32e8fe9610..1ecb3398ecf 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java @@ -17,17 +17,15 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.vfs.VfsUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.File; -public class ProjectDescriptorWithStdlibSources extends JetWithJdkAndRuntimeLightProjectDescriptor { +public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeLightProjectDescriptor { public static final ProjectDescriptorWithStdlibSources INSTANCE = new ProjectDescriptorWithStdlibSources(); @Override diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt index 373be27758b..84ba0940f4f 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt @@ -44,7 +44,7 @@ public enum class ModuleKind { KOTLIN_JAVASCRIPT } -public fun Module.configureAs(descriptor: JetLightProjectDescriptor) { +public fun Module.configureAs(descriptor: KotlinLightProjectDescriptor) { val module = this updateModel(module, object : Consumer { override fun consume(model: ModifiableRootModel) { diff --git a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt index 51ec484ba5d..f1ca0f4729e 100644 --- a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt @@ -19,17 +19,17 @@ package org.jetbrains.kotlin import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.codeStyle.PackageEntry import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE +public abstract class AbstractImportsTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE protected fun doTest(testPath: String) { val settingManager = CodeStyleSettingsManager.getInstance() @@ -70,7 +70,7 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() doTest(file) } - JetTestUtils.assertEqualsToFile(File(testPath + ".after"), myFixture.getFile().getText()) + KotlinTestUtils.assertEqualsToFile(File(testPath + ".after"), myFixture.getFile().getText()) } finally { settingManager.dropTemporarySettings() diff --git a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt index 3c984d53899..da840b611a7 100644 --- a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTest.kt @@ -20,17 +20,17 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.idea.completion.renderDataFlowValue -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractDataFlowValueRenderingTest: KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath() : String { return PluginTestCaseBase.getTestDataPathBase() + "/dataFlowValueRendering/" } @@ -51,6 +51,6 @@ public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFix val allValues = (info.getCompleteTypeInfo().keySet() + info.getCompleteNullabilityInfo().keySet()).toSet() val actual = allValues.map { renderDataFlowValue(it) }.filterNotNull().sorted().joinToString("\n") - JetTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual) + KotlinTestUtils.assertEqualsToFile(File(FileUtil.getNameWithoutExtension(fileName) + ".txt"), actual) } } diff --git a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java index df59204b151..5dc762f408a 100644 --- a/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/DataFlowValueRenderingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,66 +32,66 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest { public void testAllFilesPresentInDataFlowValueRendering() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classProperty.kt") public void testClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt"); doTest(fileName); } @TestMetadata("complexIdentifier.kt") public void testComplexIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt"); doTest(fileName); } @TestMetadata("complexIdentifierWithImplicitReceiver.kt") public void testComplexIdentifierWithImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("complexIdentifierWithInitiallyNullableReceiver.kt") public void testComplexIdentifierWithInitiallyNullableReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt"); doTest(fileName); } @TestMetadata("complexIdentifierWithReceiver.kt") public void testComplexIdentifierWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt"); doTest(fileName); } @TestMetadata("multipleVariables.kt") public void testMultipleVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt"); doTest(fileName); } @TestMetadata("packageProperty.kt") public void testPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt"); doTest(fileName); } @TestMetadata("receivers.kt") public void testReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt"); doTest(fileName); } @TestMetadata("smartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt"); doTest(fileName); } @TestMetadata("smartNotNull.kt") public void testSmartNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt index 489f202e742..8bb97e9ac56 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/KotlinLightClassInheritorTest.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.JavaPsiFacade import com.intellij.psi.search.GlobalSearchScope import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile import org.junit.Assert -public class KotlinLightClassInheritorTest : JetLightCodeInsightFixtureTestCase() { +public class KotlinLightClassInheritorTest : KotlinLightCodeInsightFixtureTestCase() { public fun testAnnotation() { doTestInheritorByText("annotation class A", "java.lang.annotation.Annotation", false) } @@ -54,5 +54,5 @@ public class KotlinLightClassInheritorTest : JetLightCodeInsightFixtureTestCase( Assert.assertTrue(psiClass.isInheritor(baseClass, checkDeep)) } - override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java index bc1b089c764..e8d6f17816f 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; @@ -107,6 +107,6 @@ public abstract class AbstractJavaAgainstKotlinCheckerTest extends KotlinDaemonA @Override protected String getTestDataPath() { - return JetTestUtils.getHomeDirectory() + "/"; + return KotlinTestUtils.getHomeDirectory() + "/"; } } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java index ca7848aab8d..2a9d9bffc16 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJsCheckerTest.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor; -public abstract class AbstractJsCheckerTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractJsCheckerTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java index c6a1d23958b..368fc61b927 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractPsiCheckerTest.java @@ -21,11 +21,11 @@ import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.highlighter.NameHighlighter; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import java.io.File; -public abstract class AbstractPsiCheckerTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractPsiCheckerTest extends KotlinLightCodeInsightFixtureTestCase { public void doTest(@NotNull String filePath) throws Exception { myFixture.configureByFile(filePath); checkHighlighting(true, false, false); diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java index 3698bbd5e16..9addd2dab6f 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinBinariesCheckerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JavaAgainstKotlinBinariesCheckerTestGenerated extends AbstractJavaAgainstKotlinBinariesCheckerTest { public void testAllFilesPresentInJavaAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssignKotlinClassToObjectInJava.kt") public void testAssignKotlinClassToObjectInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt"); doTest(fileName); } @TestMetadata("AssignMappedKotlinType.kt") public void testAssignMappedKotlinType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt"); doTest(fileName); } @TestMetadata("ClassObjects.kt") public void testClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt"); doTest(fileName); } @TestMetadata("EnumAutoGeneratedMethods.kt") public void testEnumAutoGeneratedMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt"); doTest(fileName); } @TestMetadata("EnumEntriesInSwitch.kt") public void testEnumEntriesInSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt"); doTest(fileName); } @TestMetadata("EnumStaticImportInJava.kt") public void testEnumStaticImportInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt"); doTest(fileName); } @TestMetadata("ImplementedMethodsFromTraits.kt") public void testImplementedMethodsFromTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt"); doTest(fileName); } @TestMetadata("JvmOverloadsFunctions.kt") public void testJvmOverloadsFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt"); doTest(fileName); } @TestMetadata("KotlinAnnotations.kt") public void testKotlinAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt"); doTest(fileName); } @TestMetadata("ReturnInnerClasses.kt") public void testReturnInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt"); doTest(fileName); } @TestMetadata("TopLevelFunctionInDataFlowInspection.kt") public void testTopLevelFunctionInDataFlowInspection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt"); doTest(fileName); } @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt") public void testUseKotlinSubclassesOfMappedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt"); doTest(fileName); } @TestMetadata("UsingKotlinPackageDeclarations.kt") public void testUsingKotlinPackageDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java index 5522ed0aa66..6181befdd12 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JavaAgainstKotlinSourceCheckerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,84 +34,84 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga @RunWith(JUnit3RunnerWithInners.class) public static class JavaAgainstKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest { public void testAllFilesPresentInJavaAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssignKotlinClassToObjectInJava.kt") public void testAssignKotlinClassToObjectInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignKotlinClassToObjectInJava.kt"); doTest(fileName); } @TestMetadata("AssignMappedKotlinType.kt") public void testAssignMappedKotlinType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/AssignMappedKotlinType.kt"); doTest(fileName); } @TestMetadata("ClassObjects.kt") public void testClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ClassObjects.kt"); doTest(fileName); } @TestMetadata("EnumAutoGeneratedMethods.kt") public void testEnumAutoGeneratedMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumAutoGeneratedMethods.kt"); doTest(fileName); } @TestMetadata("EnumEntriesInSwitch.kt") public void testEnumEntriesInSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumEntriesInSwitch.kt"); doTest(fileName); } @TestMetadata("EnumStaticImportInJava.kt") public void testEnumStaticImportInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/EnumStaticImportInJava.kt"); doTest(fileName); } @TestMetadata("ImplementedMethodsFromTraits.kt") public void testImplementedMethodsFromTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ImplementedMethodsFromTraits.kt"); doTest(fileName); } @TestMetadata("JvmOverloadsFunctions.kt") public void testJvmOverloadsFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt"); doTest(fileName); } @TestMetadata("KotlinAnnotations.kt") public void testKotlinAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.kt"); doTest(fileName); } @TestMetadata("ReturnInnerClasses.kt") public void testReturnInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ReturnInnerClasses.kt"); doTest(fileName); } @TestMetadata("TopLevelFunctionInDataFlowInspection.kt") public void testTopLevelFunctionInDataFlowInspection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/TopLevelFunctionInDataFlowInspection.kt"); doTest(fileName); } @TestMetadata("UseKotlinSubclassesOfMappedTypes.kt") public void testUseKotlinSubclassesOfMappedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UseKotlinSubclassesOfMappedTypes.kt"); doTest(fileName); } @TestMetadata("UsingKotlinPackageDeclarations.kt") public void testUsingKotlinPackageDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/UsingKotlinPackageDeclarations.kt"); doTest(fileName); } } @@ -121,12 +121,12 @@ public class JavaAgainstKotlinSourceCheckerTestGenerated extends AbstractJavaAga @RunWith(JUnit3RunnerWithInners.class) public static class JavaWithKotlin extends AbstractJavaAgainstKotlinSourceCheckerTest { public void testAllFilesPresentInJavaWithKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kotlinAndJavaChecker/javaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NoNotNullOnParameterInOverride.kt") public void testNoNotNullOnParameterInOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kotlinAndJavaChecker/javaWithKotlin/NoNotNullOnParameterInOverride.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java index 013fa7ef860..03d39f3a068 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JsCheckerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,26 +30,26 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/checker/js") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest { +public class JsCheckerTestGenerated extends AbstractJsCheckerTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt"); doTest(fileName); } @TestMetadata("dynamic.kt") public void testDynamic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/dynamic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/dynamic.kt"); doTest(fileName); } @TestMetadata("helloWorld.kt") public void testHelloWorld() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java index 88cef5ac94a..4ab9fca7ce7 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/PsiCheckerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,342 +28,342 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { +public class PsiCheckerTestGenerated extends AbstractPsiCheckerTest { @TestMetadata("idea/testData/checker") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Checker extends AbstractJetPsiCheckerTest { + public static class Checker extends AbstractPsiCheckerTest { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Abstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Abstract.kt"); doTest(fileName); } public void testAllFilesPresentInChecker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("AnnotationOnFile.kt") public void testAnnotationOnFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/AnnotationOnFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/AnnotationOnFile.kt"); doTest(fileName); } @TestMetadata("AnonymousInitializers.kt") public void testAnonymousInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/AnonymousInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/AnonymousInitializers.kt"); doTest(fileName); } @TestMetadata("BinaryCallsOnNullableValues.kt") public void testBinaryCallsOnNullableValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BinaryCallsOnNullableValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BinaryCallsOnNullableValues.kt"); doTest(fileName); } @TestMetadata("Bounds.kt") public void testBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Bounds.kt"); doTest(fileName); } @TestMetadata("Bounds2.kt") public void testBounds2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Bounds2.kt"); doTest(fileName); } @TestMetadata("BoundsWithSubstitutors.kt") public void testBoundsWithSubstitutors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BoundsWithSubstitutors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BoundsWithSubstitutors.kt"); doTest(fileName); } @TestMetadata("BreakContinue.kt") public void testBreakContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BreakContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/BreakContinue.kt"); doTest(fileName); } @TestMetadata("Builders.kt") public void testBuilders() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Builders.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Builders.kt"); doTest(fileName); } @TestMetadata("Casts.kt") public void testCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Casts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Casts.kt"); doTest(fileName); } @TestMetadata("ClassObjectInEnum.kt") public void testClassObjectInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjectInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ClassObjectInEnum.kt"); doTest(fileName); } @TestMetadata("ClassObjects.kt") public void testClassObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ClassObjects.kt"); doTest(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Constants.kt"); doTest(fileName); } @TestMetadata("Constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Constructors.kt"); doTest(fileName); } @TestMetadata("CyclicHierarchy.kt") public void testCyclicHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/CyclicHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/CyclicHierarchy.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctions.kt") public void testExtensionFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ExtensionFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ExtensionFunctions.kt"); doTest(fileName); } @TestMetadata("ForRangeConventions.kt") public void testForRangeConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ForRangeConventions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ForRangeConventions.kt"); doTest(fileName); } @TestMetadata("FunctionReturnTypes.kt") public void testFunctionReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/FunctionReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/FunctionReturnTypes.kt"); doTest(fileName); } @TestMetadata("GenericArgumentConsistency.kt") public void testGenericArgumentConsistency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/GenericArgumentConsistency.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/GenericArgumentConsistency.kt"); doTest(fileName); } @TestMetadata("IncDec.kt") public void testIncDec() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IncDec.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/IncDec.kt"); doTest(fileName); } @TestMetadata("IsExpressions.kt") public void testIsExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IsExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/IsExpressions.kt"); doTest(fileName); } @TestMetadata("LocalObjects.kt") public void testLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt"); doTest(fileName); } @TestMetadata("MultipleBounds.kt") public void testMultipleBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/MultipleBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/MultipleBounds.kt"); doTest(fileName); } @TestMetadata("NestedObjects.kt") public void testNestedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt"); doTest(fileName); } @TestMetadata("NotFinishedGenericDeclaration.kt") public void testNotFinishedGenericDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NotFinishedGenericDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/NotFinishedGenericDeclaration.kt"); doTest(fileName); } @TestMetadata("Nullability.kt") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Nullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Nullability.kt"); doTest(fileName); } @TestMetadata("Objects.kt") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Objects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Objects.kt"); doTest(fileName); } @TestMetadata("Override.kt") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Override.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Override.kt"); doTest(fileName); } @TestMetadata("OverridesAndGenerics.kt") public void testOverridesAndGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/OverridesAndGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/OverridesAndGenerics.kt"); doTest(fileName); } @TestMetadata("PackageAsExpression.kt") public void testPackageAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PackageAsExpression.kt"); doTest(fileName); } @TestMetadata("PackageQualified.kt") public void testPackageQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PackageQualified.kt"); doTest(fileName); } @TestMetadata("PlatformStaticUsagesRuntime.kt") public void testPlatformStaticUsagesRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PlatformStaticUsagesRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PlatformStaticUsagesRuntime.kt"); doTest(fileName); } @TestMetadata("PrimaryConstructors.kt") public void testPrimaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt"); doTest(fileName); } @TestMetadata("ProjectionsInSupertypes.kt") public void testProjectionsInSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ProjectionsInSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ProjectionsInSupertypes.kt"); doTest(fileName); } @TestMetadata("Properties.kt") public void testProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Properties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Properties.kt"); doTest(fileName); } @TestMetadata("QualifiedExpressions.kt") public void testQualifiedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedExpressions.kt"); doTest(fileName); } @TestMetadata("QualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedThis.kt"); doTest(fileName); } @TestMetadata("QualifiedThisInClosures.kt") public void testQualifiedThisInClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThisInClosures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/QualifiedThisInClosures.kt"); doTest(fileName); } @TestMetadata("Redeclaration.kt") public void testRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Redeclaration.kt"); doTest(fileName); } @TestMetadata("Redeclarations.kt") public void testRedeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Redeclarations.kt"); doTest(fileName); } @TestMetadata("ResolveToJava.kt") public void testResolveToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ResolveToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ResolveToJava.kt"); doTest(fileName); } @TestMetadata("ResolveTypeInAnnotationArgumentRuntime.kt") public void testResolveTypeInAnnotationArgumentRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ResolveTypeInAnnotationArgumentRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ResolveTypeInAnnotationArgumentRuntime.kt"); doTest(fileName); } @TestMetadata("ReturnTypeMismatchOnOverride.kt") public void testReturnTypeMismatchOnOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ReturnTypeMismatchOnOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/ReturnTypeMismatchOnOverride.kt"); doTest(fileName); } @TestMetadata("Shadowing.kt") public void testShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Shadowing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Shadowing.kt"); doTest(fileName); } @TestMetadata("StringTemplates.kt") public void testStringTemplates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/StringTemplates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/StringTemplates.kt"); doTest(fileName); } @TestMetadata("SupertypeListChecks.kt") public void testSupertypeListChecks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/SupertypeListChecks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/SupertypeListChecks.kt"); doTest(fileName); } @TestMetadata("TraitSupertypeList.kt") public void testTraitSupertypeList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/TraitSupertypeList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/TraitSupertypeList.kt"); doTest(fileName); } @TestMetadata("trivialHierarchyLoop.kt") public void testTrivialHierarchyLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/trivialHierarchyLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/trivialHierarchyLoop.kt"); doTest(fileName); } @TestMetadata("TypeParameterBounds.kt") public void testTypeParameterBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/TypeParameterBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/TypeParameterBounds.kt"); doTest(fileName); } @TestMetadata("UnreachableCode.kt") public void testUnreachableCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/UnreachableCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/UnreachableCode.kt"); doTest(fileName); } @TestMetadata("Unresolved.kt") public void testUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Unresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Unresolved.kt"); doTest(fileName); } @TestMetadata("Unused.kt") public void testUnused() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Unused.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Unused.kt"); doTest(fileName); } @TestMetadata("Variance.kt") public void testVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Variance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/Variance.kt"); doTest(fileName); } @TestMetadata("When.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/When.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/When.kt"); doTest(fileName); } @TestMetadata("WhenInEnumInExtensionProperty.kt") public void testWhenInEnumInExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/WhenInEnumInExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/WhenInEnumInExtensionProperty.kt"); doTest(fileName); } } @@ -371,152 +371,152 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/regression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Regression extends AbstractJetPsiCheckerTest { + public static class Regression extends AbstractPsiCheckerTest { public void testAllFilesPresentInRegression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") public void testAmbiguityOnLazyTypeComputation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt"); doTest(fileName); } @TestMetadata("AssignmentsUnderOperators.kt") public void testAssignmentsUnderOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AssignmentsUnderOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/AssignmentsUnderOperators.kt"); doTest(fileName); } @TestMetadata("BadParseForClass.kt") public void testBadParseForClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/BadParseForClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/BadParseForClass.kt"); doTest(fileName); } @TestMetadata("CoercionToUnit.kt") public void testCoercionToUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/CoercionToUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/CoercionToUnit.kt"); doTest(fileName); } @TestMetadata("createInnerInstance.kt") public void testCreateInnerInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/createInnerInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/createInnerInstance.kt"); doTest(fileName); } @TestMetadata("DoubleDefine.kt") public void testDoubleDefine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/DoubleDefine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/DoubleDefine.kt"); doTest(fileName); } @TestMetadata("extensionMemberInClassObject.kt") public void testExtensionMemberInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/extensionMemberInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/extensionMemberInClassObject.kt"); doTest(fileName); } @TestMetadata("Jet11.kt") public void testJet11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet11.kt"); doTest(fileName); } @TestMetadata("Jet121.kt") public void testJet121() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet121.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet121.kt"); doTest(fileName); } @TestMetadata("Jet124.kt") public void testJet124() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet124.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet124.kt"); doTest(fileName); } @TestMetadata("Jet169.kt") public void testJet169() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet169.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet169.kt"); doTest(fileName); } @TestMetadata("Jet183.kt") public void testJet183() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183.kt"); doTest(fileName); } @TestMetadata("Jet183-1.kt") public void testJet183_1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183-1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183-1.kt"); doTest(fileName); } @TestMetadata("Jet53.kt") public void testJet53() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet53.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet53.kt"); doTest(fileName); } @TestMetadata("Jet67.kt") public void testJet67() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet67.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet67.kt"); doTest(fileName); } @TestMetadata("Jet68.kt") public void testJet68() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet68.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet68.kt"); doTest(fileName); } @TestMetadata("Jet69.kt") public void testJet69() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet69.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet69.kt"); doTest(fileName); } @TestMetadata("Jet72.kt") public void testJet72() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet72.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/Jet72.kt"); doTest(fileName); } @TestMetadata("kt251.kt") public void testKt251() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt251.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/kt251.kt"); doTest(fileName); } @TestMetadata("kt303.kt") public void testKt303() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt303.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/kt303.kt"); doTest(fileName); } @TestMetadata("OverrideResolution.kt") public void testOverrideResolution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/OverrideResolution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/OverrideResolution.kt"); doTest(fileName); } @TestMetadata("ScopeForSecondaryConstructors.kt") public void testScopeForSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt"); doTest(fileName); } @TestMetadata("SpecififcityByReceiver.kt") public void testSpecififcityByReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/SpecififcityByReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/SpecififcityByReceiver.kt"); doTest(fileName); } @TestMetadata("WrongTraceInCallResolver.kt") public void testWrongTraceInCallResolver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/WrongTraceInCallResolver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/regression/WrongTraceInCallResolver.kt"); doTest(fileName); } } @@ -524,20 +524,20 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/recovery") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Recovery extends AbstractJetPsiCheckerTest { + public static class Recovery extends AbstractPsiCheckerTest { public void testAllFilesPresentInRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("namelessMembers.kt") public void testNamelessMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessMembers.kt"); doTest(fileName); } @TestMetadata("namelessToplevelDeclarations.kt") public void testNamelessToplevelDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessToplevelDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessToplevelDeclarations.kt"); doTest(fileName); } } @@ -545,14 +545,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/rendering") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Rendering extends AbstractJetPsiCheckerTest { + public static class Rendering extends AbstractPsiCheckerTest { public void testAllFilesPresentInRendering() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("TypeInferenceError.kt") public void testTypeInferenceError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/rendering/TypeInferenceError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/rendering/TypeInferenceError.kt"); doTest(fileName); } } @@ -560,22 +560,22 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest { + public static class DuplicateJvmSignature extends AbstractPsiCheckerTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Fields extends AbstractJetPsiCheckerTest { + public static class Fields extends AbstractPsiCheckerTest { public void testAllFilesPresentInFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectCopiedFieldObject.kt") public void testClassObjectCopiedFieldObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt"); doTest(fileName); } } @@ -583,62 +583,62 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FunctionAndProperty extends AbstractJetPsiCheckerTest { + public static class FunctionAndProperty extends AbstractPsiCheckerTest { public void testAllFilesPresentInFunctionAndProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt"); doTest(fileName); } @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt"); doTest(fileName); } @TestMetadata("objectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt"); doTest(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt"); doTest(fileName); } @TestMetadata("topLevelMultifileRuntime.kt") public void testTopLevelMultifileRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt"); doTest(fileName); } } @@ -646,14 +646,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TraitImpl extends AbstractJetPsiCheckerTest { + public static class TraitImpl extends AbstractPsiCheckerTest { public void testAllFilesPresentInTraitImpl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("twoTraits.kt") public void testTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt"); doTest(fileName); } } @@ -662,50 +662,50 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/infos") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Infos extends AbstractJetPsiCheckerTest { + public static class Infos extends AbstractPsiCheckerTest { public void testAllFilesPresentInInfos() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CapturedConstructorParameter.kt") public void testCapturedConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedConstructorParameter.kt"); doTestWithInfos(fileName); } @TestMetadata("CapturedInInlinedClosure.kt") public void testCapturedInInlinedClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedInInlinedClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedInInlinedClosure.kt"); doTestWithInfos(fileName); } @TestMetadata("PropertiesWithBackingFields.kt") public void testPropertiesWithBackingFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/PropertiesWithBackingFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/PropertiesWithBackingFields.kt"); doTestWithInfos(fileName); } @TestMetadata("SmartCasts.kt") public void testSmartCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCasts.kt"); doTestWithInfos(fileName); } @TestMetadata("SmartCastsWithSafeAccess.kt") public void testSmartCastsWithSafeAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt"); doTestWithInfos(fileName); } @TestMetadata("Typos.kt") public void testTypos() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/Typos.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/Typos.kt"); doTestWithInfos(fileName); } @TestMetadata("WrapIntoRef.kt") public void testWrapIntoRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/WrapIntoRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/checker/infos/WrapIntoRef.kt"); doTestWithInfos(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java index 3886797d706..6094df13dbd 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java @@ -55,8 +55,8 @@ import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory; import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.*; @@ -70,7 +70,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -public abstract class AbstractFindUsagesTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractFindUsagesTest extends KotlinLightCodeInsightFixtureTestCase { public static final UsageViewPresentation USAGE_VIEW_PRESENTATION = new UsageViewPresentation(); @@ -282,7 +282,7 @@ public abstract class AbstractFindUsagesTest extends JetLightCodeInsightFixtureT @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } @Override diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt index c79b4a83bfd..cc357b2bd8f 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractKotlinFindUsagesWithLibraryTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -public abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractJetFindUsagesTest() { +public abstract class AbstractKotlinFindUsagesWithLibraryTest : AbstractFindUsagesTest() { override fun getProjectDescriptor() = JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/findUsages/libraryUsages/_library", true) } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java index dda3d9622aa..ddaf7bb88a4 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.findUsages; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,44 +28,44 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { +public class FindUsagesTestGenerated extends AbstractFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Kotlin extends AbstractJetFindUsagesTest { + public static class Kotlin extends AbstractFindUsagesTest { public void testAllFilesPresentInKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("idea/testData/findUsages/kotlin/companionObject") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CompanionObject extends AbstractJetFindUsagesTest { + public static class CompanionObject extends AbstractFindUsagesTest { public void testAllFilesPresentInCompanionObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/companionObject"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/companionObject"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("inContainingClass.0.kt") public void testInContainingClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/inContainingClass.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/inContainingClass.0.kt"); doTest(fileName); } @TestMetadata("javaUsage.0.kt") public void testJavaUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt"); doTest(fileName); } @TestMetadata("named.0.kt") public void testNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/named.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/named.0.kt"); doTest(fileName); } @TestMetadata("simple.0.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/simple.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/simple.0.kt"); doTest(fileName); } } @@ -73,110 +73,110 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/conventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Conventions extends AbstractJetFindUsagesTest { + public static class Conventions extends AbstractFindUsagesTest { public void testAllFilesPresentInConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/conventions"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/conventions"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("compareTo.0.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/compareTo.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/compareTo.0.kt"); doTest(fileName); } @TestMetadata("componentFunctions.0.kt") public void testComponentFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt"); doTest(fileName); } @TestMetadata("componentFunctionsByRef.0.kt") public void testComponentFunctionsByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt"); doTest(fileName); } @TestMetadata("contains.0.kt") public void testContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/contains.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/contains.0.kt"); doTest(fileName); } @TestMetadata("equals.0.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/equals.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/equals.0.kt"); doTest(fileName); } @TestMetadata("forIteration.0.kt") public void testForIteration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/forIteration.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/forIteration.0.kt"); doTest(fileName); } @TestMetadata("get.0.kt") public void testGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/get.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/get.0.kt"); doTest(fileName); } @TestMetadata("getAsPropertyDelegate.0.kt") public void testGetAsPropertyDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.0.kt"); doTest(fileName); } @TestMetadata("identityEquals.0.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt"); doTest(fileName); } @TestMetadata("inc.0.kt") public void testInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/inc.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/inc.0.kt"); doTest(fileName); } @TestMetadata("invoke.0.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/invoke.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/invoke.0.kt"); doTest(fileName); } @TestMetadata("plus.0.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plus.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plus.0.kt"); doTest(fileName); } @TestMetadata("plusAssign.0.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt"); doTest(fileName); } @TestMetadata("propertyDelegatedFunction.0.kt") public void testPropertyDelegatedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.0.kt"); doTest(fileName); } @TestMetadata("set.0.kt") public void testSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/set.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/set.0.kt"); doTest(fileName); } @TestMetadata("setAsPropertyDelegate.0.kt") public void testSetAsPropertyDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.0.kt"); doTest(fileName); } @TestMetadata("unaryMinus.0.kt") public void testUnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt"); doTest(fileName); } } @@ -184,338 +184,338 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findClassUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindClassUsages extends AbstractJetFindUsagesTest { + public static class FindClassUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindClassUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("classUsedInPlainText.0.kt") public void testClassUsedInPlainText() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.0.kt"); doTest(fileName); } @TestMetadata("classUsedInTextAsRef.0.kt") public void testClassUsedInTextAsRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt"); doTest(fileName); } @TestMetadata("javaClassAllUsages.0.kt") public void testJavaClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("javaClassConstructorUsages.0.kt") public void testJavaClassConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("javaClassFunctionUsages1.0.kt") public void testJavaClassFunctionUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt"); doTest(fileName); } @TestMetadata("javaClassFunctionUsages2.0.kt") public void testJavaClassFunctionUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt"); doTest(fileName); } @TestMetadata("javaClassNonConstructorUsages.0.kt") public void testJavaClassNonConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("javaClassPropertyUsages1.0.kt") public void testJavaClassPropertyUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt"); doTest(fileName); } @TestMetadata("javaClassPropertyUsages2.0.kt") public void testJavaClassPropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("javaClassSecondaryCtrUsages.0.kt") public void testJavaClassSecondaryCtrUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.0.kt"); doTest(fileName); } @TestMetadata("javaDerivedClassUsages1.0.kt") public void testJavaDerivedClassUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt"); doTest(fileName); } @TestMetadata("javaDerivedClassUsages2.0.kt") public void testJavaDerivedClassUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt"); doTest(fileName); } @TestMetadata("javaDerivedInterfaceUsages1.0.kt") public void testJavaDerivedInterfaceUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt"); doTest(fileName); } @TestMetadata("javaDerivedInterfaceUsages2.0.kt") public void testJavaDerivedInterfaceUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassAllUsages.0.kt") public void testKotlinClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassAllUsages2.0.kt") public void testKotlinClassAllUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassAllUsages3.0.kt") public void testKotlinClassAllUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassAllUsagesNoImport.0.kt") public void testKotlinClassAllUsagesNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassConstructorUsages.0.kt") public void testKotlinClassConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedAnonymousObjects.0.kt") public void testKotlinClassDerivedAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedClasses.0.kt") public void testKotlinClassDerivedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedInnerClasses.0.kt") public void testKotlinClassDerivedInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedInnerObjects.0.kt") public void testKotlinClassDerivedInnerObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedLocalClasses.0.kt") public void testKotlinClassDerivedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedLocalObjects.0.kt") public void testKotlinClassDerivedLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedLocalTraits.0.kt") public void testKotlinClassDerivedLocalTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedObjects.0.kt") public void testKotlinClassDerivedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassDerivedTraits.0.kt") public void testKotlinClassDerivedTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassFunctionUsages1.0.kt") public void testKotlinClassFunctionUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassFunctionUsages2.0.kt") public void testKotlinClassFunctionUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassNonConstructorUsages.0.kt") public void testKotlinClassNonConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassPropertyUsages1.0.kt") public void testKotlinClassPropertyUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassPropertyUsages2.0.kt") public void testKotlinClassPropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassSecondaryCtorUsages.0.kt") public void testKotlinClassSecondaryCtorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinDeeplyNestedClassAllUsages.0.kt") public void testKotlinDeeplyNestedClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinInnerClassAllUsages.0.kt") public void testKotlinInnerClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassDerivedAnonymousObjects.0.kt") public void testKotlinLocalClassDerivedAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassDerivedLocalClasses.0.kt") public void testKotlinLocalClassDerivedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassDerivedLocalObjects.0.kt") public void testKotlinLocalClassDerivedLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassDerivedLocalTraits.0.kt") public void testKotlinLocalClassDerivedLocalTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassUsages1.0.kt") public void testKotlinLocalClassUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalClassUsages2.0.kt") public void testKotlinLocalClassUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinNestedClassAllUsages.0.kt") public void testKotlinNestedClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivateClassUsages.0.kt") public void testKotlinPrivateClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedAnonymousObjects.0.kt") public void testKotlinTraitDerivedAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedClasses.0.kt") public void testKotlinTraitDerivedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedInnerClasses.0.kt") public void testKotlinTraitDerivedInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedInnerObjects.0.kt") public void testKotlinTraitDerivedInnerObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedLocalClasses.0.kt") public void testKotlinTraitDerivedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedLocalObjects.0.kt") public void testKotlinTraitDerivedLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedLocalTraits.0.kt") public void testKotlinTraitDerivedLocalTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedObjects.0.kt") public void testKotlinTraitDerivedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitDerivedTraits.0.kt") public void testKotlinTraitDerivedTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt"); doTest(fileName); } @TestMetadata("localAndNonLocalClass.0.kt") public void testLocalAndNonLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.0.kt"); doTest(fileName); } @TestMetadata("primaryConstructorWithDefaultParams.0.kt") public void testPrimaryConstructorWithDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt"); doTest(fileName); } } @@ -523,176 +523,176 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindFunctionUsages extends AbstractJetFindUsagesTest { + public static class FindFunctionUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindFunctionUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findFunctionUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findFunctionUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("enumFunctionUsages.0.kt") public void testEnumFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("functionUsedInPlainText.0.kt") public void testFunctionUsedInPlainText() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.0.kt"); doTest(fileName); } @TestMetadata("highlightingOfSuperUsages.0.kt") public void testHighlightingOfSuperUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.0.kt"); doTest(fileName); } @TestMetadata("javaAndKotlinOverrides.0.kt") public void testJavaAndKotlinOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt"); doTest(fileName); } @TestMetadata("javaMethodUsages.0.kt") public void testJavaMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("jvmOverloaded.0.kt") public void testJvmOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.0.kt"); doTest(fileName); } @TestMetadata("kotlinInternalMethodUsages.0.kt") public void testKotlinInternalMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalMethodUsages1.0.kt") public void testKotlinLocalMethodUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalMethodUsages2.0.kt") public void testKotlinLocalMethodUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinMethodUsages.0.kt") public void testKotlinMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinMultiRefInImport.0.kt") public void testKotlinMultiRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt"); doTest(fileName); } @TestMetadata("kotlinNestedClassMethodUsages.0.kt") public void testKotlinNestedClassMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinOverloadAndExtensionUsages.0.kt") public void testKotlinOverloadAndExtensionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinOverloadAndExtensionUsages2.0.kt") public void testKotlinOverloadAndExtensionUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivateMethodUsages.0.kt") public void testKotlinPrivateMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinTopLevelMethodUsages.0.kt") public void testKotlinTopLevelMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinTopLevelMethodUsagesMultifile.0.kt") public void testKotlinTopLevelMethodUsagesMultifile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.0.kt"); doTest(fileName); } @TestMetadata("kotlinTopLevelMethodUsagesNoImport.0.kt") public void testKotlinTopLevelMethodUsagesNoImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt"); doTest(fileName); } @TestMetadata("kotlinTopLevelMethodUsagesWithRenamedFile.0.kt") public void testKotlinTopLevelMethodUsagesWithRenamedFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitImplThroughDelegate.0.kt") public void testKotlinTraitImplThroughDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.0.kt"); doTest(fileName); } @TestMetadata("kotlinTraitNoImplThroughDelegate.0.kt") public void testKotlinTraitNoImplThroughDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.0.kt"); doTest(fileName); } @TestMetadata("localClassMember.0.kt") public void testLocalClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.0.kt"); doTest(fileName); } @TestMetadata("objectExpressionDeepMember.0.kt") public void testObjectExpressionDeepMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.0.kt"); doTest(fileName); } @TestMetadata("objectExpressionMember.0.kt") public void testObjectExpressionMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.0.kt"); doTest(fileName); } @TestMetadata("objectExpressionMember2.0.kt") public void testObjectExpressionMember2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.0.kt"); doTest(fileName); } @TestMetadata("objectExpressionMemberInClass.0.kt") public void testObjectExpressionMemberInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.0.kt"); doTest(fileName); } @TestMetadata("synthesizedFunction.0.kt") public void testSynthesizedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt"); doTest(fileName); } @TestMetadata("usagesOfBaseForFunction.0.kt") public void testUsagesOfBaseForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt"); doTest(fileName); } } @@ -700,26 +700,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindJavaPropertyUsages extends AbstractJetFindUsagesTest { + public static class FindJavaPropertyUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindJavaPropertyUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findJavaPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findJavaPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaPropertyUsagesK.0.kt") public void testJavaPropertyUsagesK() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyUsagesKJK.0.kt") public void testJavaPropertyUsagesKJK() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyUsagesKK.0.kt") public void testJavaPropertyUsagesKK() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.0.kt"); doTest(fileName); } } @@ -727,44 +727,44 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findObjectUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindObjectUsages extends AbstractJetFindUsagesTest { + public static class FindObjectUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindObjectUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaObjectUsages.0.kt") public void testJavaObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalObjectUsages1.0.kt") public void testKotlinLocalObjectUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalObjectUsages2.0.kt") public void testKotlinLocalObjectUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinNestedObjectUsages.0.kt") public void testKotlinNestedObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinObjectUsages.0.kt") public void testKotlinObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivateObjectUsages.0.kt") public void testKotlinPrivateObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt"); doTest(fileName); } } @@ -772,14 +772,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findPackageUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindPackageUsages extends AbstractJetFindUsagesTest { + public static class FindPackageUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindPackageUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPackageUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPackageUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("kotlinPackageUsages.0.kt") public void testKotlinPackageUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.0.kt"); doTest(fileName); } } @@ -787,26 +787,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findParameterUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindParameterUsages extends AbstractJetFindUsagesTest { + public static class FindParameterUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindParameterUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("kotlinComponentFunctionParameterUsages.0.kt") public void testKotlinComponentFunctionParameterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinConstructorParameterUsages.0.kt") public void testKotlinConstructorParameterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinFunctionParameterUsages.0.kt") public void testKotlinFunctionParameterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt"); doTest(fileName); } } @@ -814,38 +814,38 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindPrimaryConstructorUsages extends AbstractJetFindUsagesTest { + public static class FindPrimaryConstructorUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindPrimaryConstructorUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("jvmOverloaded.0.kt") public void testJvmOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt"); doTest(fileName); } @TestMetadata("missingName.0.kt") public void testMissingName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/missingName.0.kt"); doTest(fileName); } @TestMetadata("primaryConstructorByRef.0.kt") public void testPrimaryConstructorByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt"); doTest(fileName); } @TestMetadata("primaryConstructorNoKeyword.0.kt") public void testPrimaryConstructorNoKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt"); doTest(fileName); } @TestMetadata("primaryConstructorWithKeyword.0.kt") public void testPrimaryConstructorWithKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt"); doTest(fileName); } } @@ -853,152 +853,152 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findPropertyUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindPropertyUsages extends AbstractJetFindUsagesTest { + public static class FindPropertyUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindPropertyUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaAndKotlinOverrides.0.kt") public void testJavaAndKotlinOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt"); doTest(fileName); } @TestMetadata("javaAndKotlinOverrides2.0.kt") public void testJavaAndKotlinOverrides2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt"); doTest(fileName); } @TestMetadata("javaClassObjectPropertyUsages.0.kt") public void testJavaClassObjectPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyReadUsages.0.kt") public void testJavaPropertyReadUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyReadUsages2.0.kt") public void testJavaPropertyReadUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyUsages.0.kt") public void testJavaPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyUsages2.0.kt") public void testJavaPropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyWriteUsages.0.kt") public void testJavaPropertyWriteUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt"); doTest(fileName); } @TestMetadata("javaPropertyWriteUsages2.0.kt") public void testJavaPropertyWriteUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinClassObjectPropertyUsage.0.kt") public void testKotlinClassObjectPropertyUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalPropertyUsages1.0.kt") public void testKotlinLocalPropertyUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt"); doTest(fileName); } @TestMetadata("kotlinLocalPropertyUsages2.0.kt") public void testKotlinLocalPropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinMultiRefInImport.0.kt") public void testKotlinMultiRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt"); doTest(fileName); } @TestMetadata("kotlinNestedClassPropertyUsages.0.kt") public void testKotlinNestedClassPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivatePropertyInClassObjectUsages.0.kt") public void testKotlinPrivatePropertyInClassObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivatePropertyUsages.0.kt") public void testKotlinPrivatePropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPrivatePropertyUsages2.0.kt") public void testKotlinPrivatePropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyReadUsages.0.kt") public void testKotlinPropertyReadUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyReadUsages2.0.kt") public void testKotlinPropertyReadUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyUsages.0.kt") public void testKotlinPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyUsages2.0.kt") public void testKotlinPropertyUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyWriteUsages.0.kt") public void testKotlinPropertyWriteUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyWriteUsages2.0.kt") public void testKotlinPropertyWriteUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt"); doTest(fileName); } @TestMetadata("kotlinTopLevelPropertyUsages.0.kt") public void testKotlinTopLevelPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt"); doTest(fileName); } } @@ -1006,26 +1006,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindSecondaryConstructorUsages extends AbstractJetFindUsagesTest { + public static class FindSecondaryConstructorUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindSecondaryConstructorUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("defaultSecondaryConstructor.0.kt") public void testDefaultSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt"); doTest(fileName); } @TestMetadata("jvmOverloaded.0.kt") public void testJvmOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt"); doTest(fileName); } @TestMetadata("secondaryConstructor.0.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt"); doTest(fileName); } } @@ -1033,20 +1033,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindTypeParameterUsages extends AbstractJetFindUsagesTest { + public static class FindTypeParameterUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindTypeParameterUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("kotlinClassTypeParameterUsages.0.kt") public void testKotlinClassTypeParameterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinFunctionTypeParameterUsages.0.kt") public void testKotlinFunctionTypeParameterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt"); doTest(fileName); } } @@ -1054,14 +1054,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindWithFilteringImports extends AbstractJetFindUsagesTest { + public static class FindWithFilteringImports extends AbstractFindUsagesTest { public void testAllFilesPresentInFindWithFilteringImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("findWithFilteringImports.0.kt") public void testFindWithFilteringImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt"); doTest(fileName); } } @@ -1069,26 +1069,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindWithStructuralGrouping extends AbstractJetFindUsagesTest { + public static class FindWithStructuralGrouping extends AbstractFindUsagesTest { public void testAllFilesPresentInFindWithStructuralGrouping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithStructuralGrouping"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithStructuralGrouping"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("kotlinClassAllUsages.0.kt") public void testKotlinClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinMethodUsages.0.kt") public void testKotlinMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("kotlinPropertyUsages.0.kt") public void testKotlinPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt"); doTest(fileName); } } @@ -1096,20 +1096,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/propertyFiles") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyFiles extends AbstractJetFindUsagesTest { + public static class PropertyFiles extends AbstractFindUsagesTest { public void testAllFilesPresentInPropertyFiles() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/propertyFiles"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/propertyFiles"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("propertyFileUsagesByRef.0.kt") public void testPropertyFileUsagesByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.0.kt"); doTest(fileName); } @TestMetadata("propertyUsagesByRef.0.kt") public void testPropertyUsagesByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.0.kt"); doTest(fileName); } } @@ -1117,14 +1117,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class UnresolvedAnnotation extends AbstractJetFindUsagesTest { + public static class UnresolvedAnnotation extends AbstractFindUsagesTest { public void testAllFilesPresentInUnresolvedAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("unresolvedAnnotation.0.kt") public void testUnresolvedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt"); doTest(fileName); } } @@ -1132,26 +1132,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/variable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Variable extends AbstractJetFindUsagesTest { + public static class Variable extends AbstractFindUsagesTest { public void testAllFilesPresentInVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/variable"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/variable"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("plusAssignFun.0.kt") public void testPlusAssignFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/plusAssignFun.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/plusAssignFun.0.kt"); doTest(fileName); } @TestMetadata("readAccess.0.kt") public void testReadAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/readAccess.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/readAccess.0.kt"); doTest(fileName); } @TestMetadata("writeAccess.0.kt") public void testWriteAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/writeAccess.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/variable/writeAccess.0.kt"); doTest(fileName); } } @@ -1160,52 +1160,52 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Java extends AbstractJetFindUsagesTest { + public static class Java extends AbstractFindUsagesTest { public void testAllFilesPresentInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("idea/testData/findUsages/java/findConstructorUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindConstructorUsages extends AbstractJetFindUsagesTest { + public static class FindConstructorUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindConstructorUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findConstructorUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findConstructorUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("javaConstructorInDelegationCall.0.java") public void testJavaConstructorInDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.0.java"); doTest(fileName); } @TestMetadata("javaDefaultConstructorInDelegationCall.0.java") public void testJavaDefaultConstructorInDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.0.java"); doTest(fileName); } @TestMetadata("primaryConstructorByJavaRef.0.java") public void testPrimaryConstructorByJavaRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java"); doTest(fileName); } @TestMetadata("primaryConstructorByJavaSuperRef.0.java") public void testPrimaryConstructorByJavaSuperRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java"); doTest(fileName); } @TestMetadata("secondaryConstructorByJavaNewExpression.0.java") public void testSecondaryConstructorByJavaNewExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java"); doTest(fileName); } @TestMetadata("secondaryConstructorByJavaSuperCall.0.java") public void testSecondaryConstructorByJavaSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java"); doTest(fileName); } } @@ -1213,140 +1213,140 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaClassUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindJavaClassUsages extends AbstractJetFindUsagesTest { + public static class FindJavaClassUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindJavaClassUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaClassUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaClassUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("JKClassAllUsages.0.java") public void testJKClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedAnonymousObjects.0.java") public void testJKClassDerivedAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedClasses.0.java") public void testJKClassDerivedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedInnerClasses.0.java") public void testJKClassDerivedInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedInnerObjects.0.java") public void testJKClassDerivedInnerObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedLocalClasses.0.java") public void testJKClassDerivedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedLocalObjects.0.java") public void testJKClassDerivedLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java"); doTest(fileName); } @TestMetadata("JKClassDerivedObjects.0.java") public void testJKClassDerivedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.0.java"); doTest(fileName); } @TestMetadata("JKClassFieldsUsages.0.java") public void testJKClassFieldsUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java"); doTest(fileName); } @TestMetadata("JKClassMethodsUsages.0.java") public void testJKClassMethodsUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java"); doTest(fileName); } @TestMetadata("JKClassWithImplicitConstructorAllUsages.0.java") public void testJKClassWithImplicitConstructorAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.0.java"); doTest(fileName); } @TestMetadata("JKDerivedInterfaces.0.java") public void testJKDerivedInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java"); doTest(fileName); } @TestMetadata("JKInnerClassAllUsages.0.java") public void testJKInnerClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedAnonymousObjects.0.java") public void testJKInterfaceDerivedAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedClasses.0.java") public void testJKInterfaceDerivedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedInnerClasses.0.java") public void testJKInterfaceDerivedInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedInnerObjects.0.java") public void testJKInterfaceDerivedInnerObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedLocalClasses.0.java") public void testJKInterfaceDerivedLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedLocalObjects.0.java") public void testJKInterfaceDerivedLocalObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedLocalTraits.0.java") public void testJKInterfaceDerivedLocalTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.0.java"); doTest(fileName); } @TestMetadata("JKInterfaceDerivedObjects.0.java") public void testJKInterfaceDerivedObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.0.java"); doTest(fileName); } @TestMetadata("JKNestedClassAllUsages.0.java") public void testJKNestedClassAllUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java"); doTest(fileName); } } @@ -1354,14 +1354,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaFieldUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindJavaFieldUsages extends AbstractJetFindUsagesTest { + public static class FindJavaFieldUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindJavaFieldUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaFieldUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaFieldUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("JKFieldUsages.0.java") public void testJKFieldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java"); doTest(fileName); } } @@ -1369,26 +1369,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaMethodUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindJavaMethodUsages extends AbstractJetFindUsagesTest { + public static class FindJavaMethodUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindJavaMethodUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaMethodUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaMethodUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("JKMethodOverrides.0.java") public void testJKMethodOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.0.java"); doTest(fileName); } @TestMetadata("JKMethodUsages.0.java") public void testJKMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java"); doTest(fileName); } @TestMetadata("SyntheticProperties.0.java") public void testSyntheticProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.0.java"); doTest(fileName); } } @@ -1396,20 +1396,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaPropertyUsages") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FindJavaPropertyUsages extends AbstractJetFindUsagesTest { + public static class FindJavaPropertyUsages extends AbstractFindUsagesTest { public void testAllFilesPresentInFindJavaPropertyUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaPropertyUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaPropertyUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); } @TestMetadata("javaPropertyGetterUsagesKJ.0.java") public void testJavaPropertyGetterUsagesKJ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.0.java"); doTest(fileName); } @TestMetadata("javaPropertySetterUsagesKJ.0.java") public void testJavaPropertySetterUsagesKJ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.0.java"); doTest(fileName); } } @@ -1418,20 +1418,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/propertyFiles") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class PropertyFiles extends AbstractJetFindUsagesTest { + public static class PropertyFiles extends AbstractFindUsagesTest { public void testAllFilesPresentInPropertyFiles() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/propertyFiles"), Pattern.compile("^(.+)\\.0\\.properties$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/propertyFiles"), Pattern.compile("^(.+)\\.0\\.properties$"), true); } @TestMetadata("propertyFileUsages.0.properties") public void testPropertyFileUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/propertyFiles/propertyFileUsages.0.properties"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/propertyFiles/propertyFileUsages.0.properties"); doTest(fileName); } @TestMetadata("propertyUsages.0.properties") public void testPropertyUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/propertyFiles/propertyUsages.0.properties"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/propertyFiles/propertyUsages.0.properties"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java index f5419e83230..eb6f7f9dc74 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.findUsages; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentInLibraryUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("idea/testData/findUsages/libraryUsages/javaLibrary") @@ -40,42 +40,42 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind @RunWith(JUnit3RunnerWithInners.class) public static class JavaLibrary extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentInJavaLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/javaLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("LibraryClassUsages.0.kt") public void testLibraryClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryConstructorUsages.0.kt") public void testLibraryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryFieldUsages.0.kt") public void testLibraryFieldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryMethodUsages.0.kt") public void testLibraryMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryStaticFieldUsages.0.kt") public void testLibraryStaticFieldUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryStaticMethodUsages.0.kt") public void testLibraryStaticMethodUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt"); doTest(fileName); } } @@ -85,78 +85,78 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind @RunWith(JUnit3RunnerWithInners.class) public static class KotlinLibrary extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentInKotlinLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/kotlinLibrary"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("LibraryClassUsages.0.kt") public void testLibraryClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryCompanionObjectUsages.0.kt") public void testLibraryCompanionObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryEnumEntryUsages.0.kt") public void testLibraryEnumEntryUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryFunctionUsages.0.kt") public void testLibraryFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryMemberFunctionUsages.0.kt") public void testLibraryMemberFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassMemberFunctionUsages.0.kt") public void testLibraryNestedClassMemberFunctionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassPrimaryConstructorUsages.0.kt") public void testLibraryNestedClassPrimaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassSecondaryConstructorUsages.0.kt") public void testLibraryNestedClassSecondaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryNestedClassUsages.0.kt") public void testLibraryNestedClassUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryObjectUsages.0.kt") public void testLibraryObjectUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.0.kt"); doTest(fileName); } @TestMetadata("LibraryPrimaryConstructorUsages.0.kt") public void testLibraryPrimaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.0.kt"); doTest(fileName); } @TestMetadata("LibrarySecondaryConstructorUsages.0.kt") public void testLibrarySecondaryConstructorUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.0.kt"); doTest(fileName); } } @@ -166,7 +166,7 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind @RunWith(JUnit3RunnerWithInners.class) public static class _library extends AbstractKotlinFindUsagesWithLibraryTest { public void testAllFilesPresentIn_library() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } } diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java index 6fb850b4fbd..f3db7f014d6 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.formatter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,644 +28,644 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetFormatterTestGenerated extends AbstractJetFormatterTest { +public class FormatterTestGenerated extends AbstractFormatterTest { @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Formatter extends AbstractJetFormatterTest { + public static class Formatter extends AbstractFormatterTest { @TestMetadata("AfterSemiColonInEnumClass.after.kt") public void testAfterSemiColonInEnumClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/AfterSemiColonInEnumClass.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AfterSemiColonInEnumClass.after.kt"); doTest(fileName); } public void testAllFilesPresentInFormatter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); } @TestMetadata("AnonymousInitializers.after.kt") public void testAnonymousInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializers.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializers.after.kt"); doTest(fileName); } @TestMetadata("AnonymousInitializersLineBreak.after.kt") public void testAnonymousInitializersLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializersLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializersLineBreak.after.kt"); doTest(fileName); } @TestMetadata("ArrayAccess.after.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ArrayAccess.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ArrayAccess.after.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionAlignmentSpread.after.kt") public void testBinaryExpressionAlignmentSpread() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt"); doTest(fileName); } @TestMetadata("BinaryExpressions.after.kt") public void testBinaryExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionsBoolean.after.kt") public void testBinaryExpressionsBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.kt"); doTest(fileName); } @TestMetadata("BinaryExpressionsWithoutAlignment.after.kt") public void testBinaryExpressionsWithoutAlignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.kt"); doTest(fileName); } @TestMetadata("BlockFor.after.kt") public void testBlockFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BlockFor.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BlockFor.after.kt"); doTest(fileName); } @TestMetadata("CatchFinallyOnNewLine.after.kt") public void testCatchFinallyOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.kt"); doTest(fileName); } @TestMetadata("Class.after.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Class.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Class.after.kt"); doTest(fileName); } @TestMetadata("ClassInBody.after.kt") public void testClassInBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ClassInBody.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ClassInBody.after.kt"); doTest(fileName); } @TestMetadata("ClassLineBreak.after.kt") public void testClassLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.kt"); doTest(fileName); } @TestMetadata("ColonSpaces.after.kt") public void testColonSpaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.kt"); doTest(fileName); } @TestMetadata("CommentInFunctionLiteral.after.kt") public void testCommentInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CommentInFunctionLiteral.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/CommentInFunctionLiteral.after.kt"); doTest(fileName); } @TestMetadata("ConsecutiveCalls.after.kt") public void testConsecutiveCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveCalls.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveCalls.after.kt"); doTest(fileName); } @TestMetadata("ConsecutiveSafeCallsIndent.after.kt") public void testConsecutiveSafeCallsIndent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveSafeCallsIndent.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveSafeCallsIndent.after.kt"); doTest(fileName); } @TestMetadata("DelegationList.after.kt") public void testDelegationList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.kt"); doTest(fileName); } @TestMetadata("DoWhileLineBreak.after.kt") public void testDoWhileLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.kt"); doTest(fileName); } @TestMetadata("DoWhileSpacing.after.kt") public void testDoWhileSpacing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileSpacing.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DoWhileSpacing.after.kt"); doTest(fileName); } @TestMetadata("DocComments.after.kt") public void testDocComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DocComments.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DocComments.after.kt"); doTest(fileName); } @TestMetadata("ElseOnNewLine.after.kt") public void testElseOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.kt"); doTest(fileName); } @TestMetadata("Elvis.after.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineAfterObjectDeclaration.after.kt") public void testEmptyLineAfterObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineAfterObjectDeclaration.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineAfterObjectDeclaration.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineAfterPackage.after.kt") public void testEmptyLineAfterPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineAfterPackage.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineAfterPackage.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweeAbstractFunctions.after.kt") public void testEmptyLineBetweeAbstractFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweeAbstractFunctions.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweeAbstractFunctions.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenClassAndFunction.after.kt") public void testEmptyLineBetweenClassAndFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenClasses.after.kt") public void testEmptyLineBetweenClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenClasses.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenClasses.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenEnumEntries.after.kt") public void testEmptyLineBetweenEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenEnumEntries.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenEnumEntries.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenFunAndProperty.after.kt") public void testEmptyLineBetweenFunAndProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenFunctions.after.kt") public void testEmptyLineBetweenFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenFunctions.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenFunctions.after.kt"); doTest(fileName); } @TestMetadata("EmptyLineBetweenProperties.after.kt") public void testEmptyLineBetweenProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenProperties.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineBetweenProperties.after.kt"); doTest(fileName); } @TestMetadata("ForLineBreak.after.kt") public void testForLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.kt"); doTest(fileName); } @TestMetadata("ForNoBraces.after.kt") public void testForNoBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForNoBraces.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ForNoBraces.after.kt"); doTest(fileName); } @TestMetadata("ForSpacing.after.kt") public void testForSpacing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForSpacing.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ForSpacing.after.kt"); doTest(fileName); } @TestMetadata("FunctionCallParametersAlign.after.kt") public void testFunctionCallParametersAlign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionCallParametersAlign.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionCallParametersAlign.after.kt"); doTest(fileName); } @TestMetadata("FunctionDefParametersAlign.after.kt") public void testFunctionDefParametersAlign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionDefParametersAlign.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionDefParametersAlign.after.kt"); doTest(fileName); } @TestMetadata("FunctionExpression.after.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionExpression.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionExpression.after.kt"); doTest(fileName); } @TestMetadata("FunctionLineBreak.after.kt") public void testFunctionLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.kt"); doTest(fileName); } @TestMetadata("FunctionLiteralsInChainCalls.after.kt") public void testFunctionLiteralsInChainCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLiteralsInChainCalls.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionLiteralsInChainCalls.after.kt"); doTest(fileName); } @TestMetadata("FunctionWithInference.after.kt") public void testFunctionWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionWithInference.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionWithInference.after.kt"); doTest(fileName); } @TestMetadata("FunctionalType.after.kt") public void testFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.kt"); doTest(fileName); } @TestMetadata("GetterAndSetter.after.kt") public void testGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/GetterAndSetter.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/GetterAndSetter.after.kt"); doTest(fileName); } @TestMetadata("If.after.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/If.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/If.after.kt"); doTest(fileName); } @TestMetadata("IfElseRemoveLineBreak.after.kt") public void testIfElseRemoveLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseRemoveLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/IfElseRemoveLineBreak.after.kt"); doTest(fileName); } @TestMetadata("IfElseWithLineBreak.after.kt") public void testIfElseWithLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithLineBreak.after.kt"); doTest(fileName); } @TestMetadata("IfElseWithTrickyComments.after.kt") public void testIfElseWithTrickyComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.kt"); doTest(fileName); } @TestMetadata("IfSpacing.after.kt") public void testIfSpacing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfSpacing.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/IfSpacing.after.kt"); doTest(fileName); } @TestMetadata("KDoc.after.kt") public void testKDoc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/KDoc.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/KDoc.after.kt"); doTest(fileName); } @TestMetadata("LambdaArrow.after.kt") public void testLambdaArrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.kt"); doTest(fileName); } @TestMetadata("LoopParameterWithExplicitType.after.kt") public void testLoopParameterWithExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LoopParameterWithExplicitType.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/LoopParameterWithExplicitType.after.kt"); doTest(fileName); } @TestMetadata("Multideclaration.after.kt") public void testMultideclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Multideclaration.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Multideclaration.after.kt"); doTest(fileName); } @TestMetadata("MultilineFunctionLiteral.after.kt") public void testMultilineFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteral.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteral.after.kt"); doTest(fileName); } @TestMetadata("MultilineFunctionLiteralWithParams.after.kt") public void testMultilineFunctionLiteralWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.kt"); doTest(fileName); } @TestMetadata("NewLineForRBrace.after.kt") public void testNewLineForRBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/NewLineForRBrace.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/NewLineForRBrace.after.kt"); doTest(fileName); } @TestMetadata("ObjectInBody.after.kt") public void testObjectInBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ObjectInBody.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ObjectInBody.after.kt"); doTest(fileName); } @TestMetadata("ParameterDocComments.after.kt") public void testParameterDocComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ParameterDocComments.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ParameterDocComments.after.kt"); doTest(fileName); } @TestMetadata("Parameters.after.kt") public void testParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.kt"); doTest(fileName); } @TestMetadata("PrimaryConstructor.after.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PrimaryConstructor.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PrimaryConstructor.after.kt"); doTest(fileName); } @TestMetadata("PropertyTypeParameterList.after.kt") public void testPropertyTypeParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PropertyTypeParameterList.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyTypeParameterList.after.kt"); doTest(fileName); } @TestMetadata("PropertyWithInference.after.kt") public void testPropertyWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PropertyWithInference.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/PropertyWithInference.after.kt"); doTest(fileName); } @TestMetadata("ReferenceExpressionFunctionLiteral.after.kt") public void testReferenceExpressionFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt"); doTest(fileName); } @TestMetadata("RemoveSpacesAroundOperations.after.kt") public void testRemoveSpacesAroundOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RemoveSpacesAroundOperations.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/RemoveSpacesAroundOperations.after.kt"); doTest(fileName); } @TestMetadata("ReturnExpression.after.kt") public void testReturnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ReturnExpression.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ReturnExpression.after.kt"); doTest(fileName); } @TestMetadata("RightBracketOnNewLine.after.kt") public void testRightBracketOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.kt"); doTest(fileName); } @TestMetadata("SaveSpacesInDocComments.after.kt") public void testSaveSpacesInDocComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SaveSpacesInDocComments.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SaveSpacesInDocComments.after.kt"); doTest(fileName); } @TestMetadata("Script.after.kts") public void testScript() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Script.after.kts"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Script.after.kts"); doTest(fileName); } @TestMetadata("SecondaryConstructors.after.kt") public void testSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SecondaryConstructors.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SecondaryConstructors.after.kt"); doTest(fileName); } @TestMetadata("secondaryCtorLineBreak.after.kt") public void testSecondaryCtorLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/secondaryCtorLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/secondaryCtorLineBreak.after.kt"); doTest(fileName); } @TestMetadata("SingleLineFunctionLiteral.after.kt") public void testSingleLineFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.kt"); doTest(fileName); } @TestMetadata("SpaceAroundExtendColon.after.kt") public void testSpaceAroundExtendColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.kt"); doTest(fileName); } @TestMetadata("SpaceAroundExtendColonInObjects.after.kt") public void testSpaceAroundExtendColonInObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt"); doTest(fileName); } @TestMetadata("SpaceAroundExtendColonInSecondaryCtr.after.kt") public void testSpaceAroundExtendColonInSecondaryCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt"); doTest(fileName); } @TestMetadata("SpaceBeforeFunctionLiteral.after.kt") public void testSpaceBeforeFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceBeforeFunctionLiteral.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceBeforeFunctionLiteral.after.kt"); doTest(fileName); } @TestMetadata("SpacesAroundOperations.after.kt") public void testSpacesAroundOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.kt"); doTest(fileName); } @TestMetadata("SpacesAroundUnaryOperations.after.kt") public void testSpacesAroundUnaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.kt"); doTest(fileName); } @TestMetadata("SpacesInDeclarations.after.kt") public void testSpacesInDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesInDeclarations.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesInDeclarations.after.kt"); doTest(fileName); } @TestMetadata("SpacesInQualifiedExpressions.after.kt") public void testSpacesInQualifiedExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesInQualifiedExpressions.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesInQualifiedExpressions.after.kt"); doTest(fileName); } @TestMetadata("TryCatchLineBreak.after.kt") public void testTryCatchLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.kt"); doTest(fileName); } @TestMetadata("UnnecessarySpacesInParametersLists.after.kt") public void testUnnecessarySpacesInParametersLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/UnnecessarySpacesInParametersLists.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/UnnecessarySpacesInParametersLists.after.kt"); doTest(fileName); } @TestMetadata("When.after.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/When.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/When.after.kt"); doTest(fileName); } @TestMetadata("WhenArrow.after.kt") public void testWhenArrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.kt"); doTest(fileName); } @TestMetadata("WhenEntryExpr.after.kt") public void testWhenEntryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenEntryExpr.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenEntryExpr.after.kt"); doTest(fileName); } @TestMetadata("WhenLineBreak.after.kt") public void testWhenLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.kt"); doTest(fileName); } @TestMetadata("WhenLinesBeforeLbrace.after.kt") public void testWhenLinesBeforeLbrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLinesBeforeLbrace.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenLinesBeforeLbrace.after.kt"); doTest(fileName); } @TestMetadata("WhileLineBreak.after.kt") public void testWhileLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.kt"); doTest(fileName); } @TestMetadata("WhileOnNewLine.after.kt") public void testWhileOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.kt"); doTest(fileName); } @TestMetadata("WhileSpacing.after.kt") public void testWhileSpacing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileSpacing.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileSpacing.after.kt"); doTest(fileName); } @TestMetadata("idea/testData/formatter/modifierList") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ModifierList extends AbstractJetFormatterTest { + public static class ModifierList extends AbstractFormatterTest { public void testAllFilesPresentInModifierList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); } @TestMetadata("funAnnotationBeforeAnnotation.after.kt") public void testFunAnnotationBeforeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt"); doTest(fileName); } @TestMetadata("funAnnotationBeforeAnnotationEntry.after.kt") public void testFunAnnotationBeforeAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotationEntry.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotationEntry.after.kt"); doTest(fileName); } @TestMetadata("funAnnotationBeforeModifiers.after.kt") public void testFunAnnotationBeforeModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeModifiers.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeModifiers.after.kt"); doTest(fileName); } @TestMetadata("funAnnotationEntryBeforeAnnotation.after.kt") public void testFunAnnotationEntryBeforeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt"); doTest(fileName); } @TestMetadata("funAnnotationEntryBeforeAnnotationEntry.after.kt") public void testFunAnnotationEntryBeforeAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotationEntry.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotationEntry.after.kt"); doTest(fileName); } @TestMetadata("funAnnotationEntryBeforeModifiers.after.kt") public void testFunAnnotationEntryBeforeModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeModifiers.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeModifiers.after.kt"); doTest(fileName); } @TestMetadata("funModifierBeforeAnnotation.after.kt") public void testFunModifierBeforeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt"); doTest(fileName); } @TestMetadata("funModifierBeforeAnnotationEntry.after.kt") public void testFunModifierBeforeAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotationEntry.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotationEntry.after.kt"); doTest(fileName); } @TestMetadata("funModifierBeforeModifiers.after.kt") public void testFunModifierBeforeModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeModifiers.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeModifiers.after.kt"); doTest(fileName); } @TestMetadata("funTheOnlyModifier.after.kt") public void testFunTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("memberFunTheOnlyModifier.after.kt") public void testMemberFunTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberFunTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberFunTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("memberValTheOnlyModifier.after.kt") public void testMemberValTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberValTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberValTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("memberVarTheOnlyModifier.after.kt") public void testMemberVarTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberVarTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberVarTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("secondMemberFunTheOnlyModifier.after.kt") public void testSecondMemberFunTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("secondMemberValTheOnlyModifier.after.kt") public void testSecondMemberValTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.after.kt"); doTest(fileName); } @TestMetadata("secondMemberVarTheOnlyModifier.after.kt") public void testSecondMemberVarTheOnlyModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt"); doTest(fileName); } } @@ -673,56 +673,56 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter/parameterList") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ParameterList extends AbstractJetFormatterTest { + public static class ParameterList extends AbstractFormatterTest { public void testAllFilesPresentInParameterList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/parameterList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/parameterList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); } @TestMetadata("ArgumentListChopAsNeeded.after.kt") public void testArgumentListChopAsNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListChopAsNeeded.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListChopAsNeeded.after.kt"); doTest(fileName); } @TestMetadata("ArgumentListDoNotWrap.after.kt") public void testArgumentListDoNotWrap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListDoNotWrap.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListDoNotWrap.after.kt"); doTest(fileName); } @TestMetadata("ArgumentListWrapAlways.after.kt") public void testArgumentListWrapAlways() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListWrapAlways.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListWrapAlways.after.kt"); doTest(fileName); } @TestMetadata("ArgumentListWrapAsNeeded.after.kt") public void testArgumentListWrapAsNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListWrapAsNeeded.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ArgumentListWrapAsNeeded.after.kt"); doTest(fileName); } @TestMetadata("ParameterListChopAsNeeded.after.kt") public void testParameterListChopAsNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListChopAsNeeded.after.kt"); doTest(fileName); } @TestMetadata("ParameterListDoNotWrap.after.kt") public void testParameterListDoNotWrap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListDoNotWrap.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListDoNotWrap.after.kt"); doTest(fileName); } @TestMetadata("ParameterListWrapAlways.after.kt") public void testParameterListWrapAlways() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListWrapAlways.after.kt"); doTest(fileName); } @TestMetadata("ParameterListWrapAsNeeded.after.kt") public void testParameterListWrapAsNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/parameterList/ParameterListWrapAsNeeded.after.kt"); doTest(fileName); } } @@ -731,206 +731,206 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class FormatterInverted extends AbstractJetFormatterTest { + public static class FormatterInverted extends AbstractFormatterTest { public void testAllFilesPresentInFormatterInverted() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true); } @TestMetadata("AnonymousInitializersLineBreak.after.inv.kt") public void testAnonymousInitializersLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializersLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializersLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("BinaryExpressions.after.inv.kt") public void testBinaryExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("BinaryExpressionsBoolean.after.inv.kt") public void testBinaryExpressionsBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("BinaryExpressionsWithoutAlignment.after.inv.kt") public void testBinaryExpressionsWithoutAlignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("CatchFinallyOnNewLine.after.inv.kt") public void testCatchFinallyOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("ClassLineBreak.after.inv.kt") public void testClassLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("ColonSpaces.after.inv.kt") public void testColonSpaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("DelegationList.after.inv.kt") public void testDelegationList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("DoWhileLineBreak.after.inv.kt") public void testDoWhileLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("ElseOnNewLine.after.inv.kt") public void testElseOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("Elvis.after.inv.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("EmptyBlocks.after.inv.kt") public void testEmptyBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyBlocks.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/EmptyBlocks.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("ForLineBreak.after.inv.kt") public void testForLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("FunctionLineBreak.after.inv.kt") public void testFunctionLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("FunctionalType.after.inv.kt") public void testFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("IfElseWithTrickyComments.after.inv.kt") public void testIfElseWithTrickyComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("LambdaArrow.after.inv.kt") public void testLambdaArrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("MultilineFunctionLiteralWithParams.after.inv.kt") public void testMultilineFunctionLiteralWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("Parameters.after.inv.kt") public void testParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("RightBracketOnNewLine.after.inv.kt") public void testRightBracketOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("secondaryCtorLineBreak.after.inv.kt") public void testSecondaryCtorLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SingleLineFunctionLiteral.after.inv.kt") public void testSingleLineFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SpaceAroundExtendColon.after.inv.kt") public void testSpaceAroundExtendColon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SpaceAroundExtendColonInObjects.after.inv.kt") public void testSpaceAroundExtendColonInObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SpaceAroundExtendColonInSecondaryCtr.after.inv.kt") public void testSpaceAroundExtendColonInSecondaryCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SpacesAroundOperations.after.inv.kt") public void testSpacesAroundOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("SpacesAroundUnaryOperations.after.inv.kt") public void testSpacesAroundUnaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("TryCatchLineBreak.after.inv.kt") public void testTryCatchLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("When.after.inv.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/When.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/When.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("WhenArrow.after.inv.kt") public void testWhenArrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("WhenLineBreak.after.inv.kt") public void testWhenLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("WhileLineBreak.after.inv.kt") public void testWhileLineBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.inv.kt"); doTestInverted(fileName); } @TestMetadata("WhileOnNewLine.after.inv.kt") public void testWhileOnNewLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.inv.kt"); doTestInverted(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java index 0ff5b97f534..7dbcb141b4d 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java @@ -87,15 +87,13 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt") public void testConsecutiveCallsInSaeCallsMiddle() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt"); doNewlineTest(fileName); } @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt") public void testConsecutiveCallsInSafeCallsEnd() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt"); doNewlineTest(fileName); } @@ -149,8 +147,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt") public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt"); doNewlineTest(fileName); } @@ -180,8 +177,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InEnumInitializerListAfterComma.after.kt") public void testInEnumInitializerListAfterComma() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt"); doNewlineTest(fileName); } @@ -199,8 +195,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt") public void testInExpressionsParenthesesBeforeOperand() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt"); doNewlineTest(fileName); } @@ -224,29 +219,25 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InLambdaInsideChainCallSameLine.after.kt") public void testInLambdaInsideChainCallSameLine() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt"); doNewlineTest(fileName); } @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt") public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt"); doNewlineTest(fileName); } @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt") public void testInLambdaInsideChainCallWithNewLine() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt"); doNewlineTest(fileName); } @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt") public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt"); doNewlineTest(fileName); } @@ -294,8 +285,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt") public void testSettingAlignMultilineParametersInCalls() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt"); doNewlineTest(fileName); } @@ -315,8 +305,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("ScriptAfterExpression.after.kts") public void testScriptAfterExpression() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts"); doNewlineTest(fileName); } @@ -362,36 +351,31 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt") public void testInBinaryExpressionInMiddle() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt"); doNewlineTestWithInvert(fileName); } @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt") public void testInBinaryExpressionUnfinished() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt"); doNewlineTestWithInvert(fileName); } @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt") public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt"); doNewlineTestWithInvert(fileName); } @TestMetadata("InDelegationListAfterColon.after.inv.kt") public void testInDelegationListAfterColon() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt"); doNewlineTestWithInvert(fileName); } @TestMetadata("InDelegationListAfterComma.after.inv.kt") public void testInDelegationListAfterComma() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt"); doNewlineTestWithInvert(fileName); } @@ -409,15 +393,13 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt") public void testInEnumInitializerListAfterComma() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt"); doNewlineTestWithInvert(fileName); } @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt") public void testInEnumInitializerListNotEmpty() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt"); doNewlineTestWithInvert(fileName); } @@ -429,8 +411,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt") public void testInExpressionsParenthesesBeforeOperand() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt"); doNewlineTestWithInvert(fileName); } @@ -442,8 +423,7 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt") public void testSettingAlignMultilineParametersInCalls() throws Exception { - String fileName = KotlinTestUtils - .navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt"); doNewlineTestWithInvert(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt b/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt index e1a8a10e7d7..92c8a489e09 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractCopyPasteTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea import com.intellij.codeInsight.CodeInsightSettings import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiFile -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtFile import java.io.File -public abstract class AbstractCopyPasteTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractCopyPasteTest : KotlinLightCodeInsightFixtureTestCase() { private var savedImportsOnPasteSetting: Int = 0 private val DEFAULT_TO_FILE_TEXT = "package to\n\n" diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java index f7c0170383e..06f62bade70 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java @@ -22,13 +22,13 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTestCase { public void doTestExpressionSelection(@NotNull String path) throws Exception { configureByFile(path); - final String expectedExpression = JetTestUtils.getLastCommentInFile((KtFile) getFile()); + final String expectedExpression = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); try { JetRefactoringUtil.selectExpression(getEditor(), getFile(), new JetRefactoringUtil.SelectExpressionCallback() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java index eda7bb3d017..b11712ee4e6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ public abstract class AbstractSmartSelectionTest extends LightCodeInsightTestCas public void doTestSmartSelection(@NotNull String path) throws Exception { configureByFile(path); - String expectedResultText = JetTestUtils.getLastCommentInFile((KtFile) getFile()); + String expectedResultText = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); List expressions = JetRefactoringUtil.getSmartSelectSuggestions( getFile(), getEditor().getCaretModel().getOffset()); diff --git a/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java index 5b6327af9d3..c7861765972 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,30 +32,30 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest { public void testAllFilesPresentInExpressionSelection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("binaryExpr.kt") public void testBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt"); doTestExpressionSelection(fileName); } @TestMetadata("labelledStatement.kt") public void testLabelledStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt"); doTestExpressionSelection(fileName); } @TestMetadata("labelledThis.kt") public void testLabelledThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt"); doTestExpressionSelection(fileName); } @TestMetadata("noExpression.kt") public void testNoExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt"); doTestExpressionSelection(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java index 385dad64e3a..cf9f089406c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase { @Override protected void setUp() throws Exception { - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); super.setUp(); } @Override protected void tearDown() throws Exception { super.tearDown(); - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java index 7d97a3c675b..7003b9c6170 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase { @Override protected void setUp() throws Exception { super.setUp(); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); super.tearDown(); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java index 6256a9f62c2..cbaccf26ba5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java @@ -20,19 +20,19 @@ import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import org.jetbrains.kotlin.idea.test.RunnableWithException; import org.jetbrains.kotlin.idea.test.TestUtilsKt; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); TestUtilsKt.invalidateLibraryCache(getProject()); } @Override protected void tearDown() throws Exception { - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() { @Override diff --git a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt index c121add0142..44cc11a0220 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/RegisteredFindersTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea import com.intellij.psi.NonClasspathClassFinder import com.intellij.psi.PsiElementFinder import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade import org.junit.Assert -public class RegisteredFindersTest : JetLightCodeInsightFixtureTestCase() { +public class RegisteredFindersTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST public fun testKnownNonClasspathFinder() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt index ae00a9c4a63..d894c559391 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/ResolveElementCacheTest.kt @@ -18,16 +18,16 @@ package org.jetbrains.kotlin.idea import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -public class ResolveElementCacheTest : JetLightCodeInsightFixtureTestCase() { - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE +public class ResolveElementCacheTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE private val FILE_TEXT = """ diff --git a/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java index fad7eef3160..6b993fed8a6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest { public void testAllFilesPresentInSmartSelection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("labelledStatement.kt") public void testLabelledStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt"); doTestSmartSelection(fileName); } @TestMetadata("labelledThis.kt") public void testLabelledThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt"); doTestSmartSelection(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt"); doTestSmartSelection(fileName); } @TestMetadata("superExpression.kt") public void testSuperExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt"); doTestSmartSelection(fileName); } @TestMetadata("superExpressionWithLabel.kt") public void testSuperExpressionWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt"); doTestSmartSelection(fileName); } @TestMetadata("superExpressionWithLabelAndType.kt") public void testSuperExpressionWithLabelAndType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt"); doTestSmartSelection(fileName); } @TestMetadata("superExpressionWithType.kt") public void testSuperExpressionWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt"); doTestSmartSelection(fileName); } @TestMetadata("typeInSuperExpression.kt") public void testTypeInSuperExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt"); doTestSmartSelection(fileName); } @TestMetadata("typeInSuperExpressionWithLabel.kt") public void testTypeInSuperExpressionWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt"); doTestSmartSelection(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java index 5c7ea475166..e74cc5caadf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java @@ -22,15 +22,15 @@ import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TagsTestDataUtil; import org.testng.collections.Lists; import java.io.File; -public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase { +public class WordSelectionTest extends KotlinLightCodeInsightFixtureTestCase { private static final String TEST_RELATIVE_DIR = "wordSelection"; public void testStatements() { doTest(); } @@ -128,7 +128,7 @@ public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase { editor.getDocument().getText() ); - JetTestUtils.assertEqualsToFile(new File(failedFilePath), actualText); + KotlinTestUtils.assertEqualsToFile(new File(failedFilePath), actualText); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractGotoTestOrCodeActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractGotoTestOrCodeActionTest.kt index 87390622384..abed81015cd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractGotoTestOrCodeActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractGotoTestOrCodeActionTest.kt @@ -23,19 +23,19 @@ import com.intellij.testFramework.PlatformTestUtil import com.intellij.testIntegration.GotoTestOrCodeHandler import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractGotoTestOrCodeActionTest : JetLightCodeInsightFixtureTestCase() { +abstract class AbstractGotoTestOrCodeActionTest : KotlinLightCodeInsightFixtureTestCase() { private object Handler: GotoTestOrCodeHandler() { public override fun getSourceAndTargetElements(editor: Editor?, file: PsiFile?) = super.getSourceAndTargetElements(editor, file) } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE protected fun doTest(path: String) { val mainFile = File(path) @@ -48,7 +48,7 @@ abstract class AbstractGotoTestOrCodeActionTest : JetLightCodeInsightFixtureTest } ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText) - myFixture.testDataPath = "${JetTestUtils.getHomeDirectory()}/${mainFile.getParent()}" + myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.getParent()}" val mainFileName = mainFile.name val mainFileBaseName = mainFileName.substring(0, mainFileName.indexOf('.')) diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java index 463e58e8f0b..b98a1074d65 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/GotoTestOrCodeActionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.actions; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,36 +32,36 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class GotoTestOrCodeActionTestGenerated extends AbstractGotoTestOrCodeActionTest { public void testAllFilesPresentInGotoTestOrCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoTestOrCode"), Pattern.compile("^(.+)\\.main\\..+$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoTestOrCode"), Pattern.compile("^(.+)\\.main\\..+$"), true); } @TestMetadata("fromJavaClassToTest.main.java") public void testFromJavaClassToTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaClassToTest.main.java"); doTest(fileName); } @TestMetadata("fromJavaTestToKotlinClass.main.java") public void testFromJavaTestToKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromJavaTestToKotlinClass.main.java"); doTest(fileName); } @TestMetadata("fromKotlinClassToTest.main.kt") public void testFromKotlinClassToTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinClassToTest.main.kt"); doTest(fileName); } @TestMetadata("fromKotlinTestToJavaClass.main.kt") public void testFromKotlinTestToJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToJavaClass.main.kt"); doTest(fileName); } @TestMetadata("fromKotlinTestToKotlinClass.main.kt") public void testFromKotlinTestToKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoTestOrCode/fromKotlinTestToKotlinClass.main.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt index 4d4d9c1c8ab..6858b74caa9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.psi.JavaPsiFacade import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.asJava.LightClassTestCommon -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import java.io.File -abstract class AbstractIdeLightClassTest : JetLightCodeInsightFixtureTestCase() { +abstract class AbstractIdeLightClassTest : KotlinLightCodeInsightFixtureTestCase() { fun doTest(testDataPath: String) { myFixture.configureByFile(testDataPath) @@ -42,5 +42,5 @@ abstract class AbstractIdeLightClassTest : JetLightCodeInsightFixtureTestCase() ) } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt index c60491c2b8e..e761cecada4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt @@ -22,17 +22,17 @@ import com.intellij.openapi.roots.libraries.Library import java.io.File import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ContentEntry -public class HighlightingWithDependentLibrariesTest : JetLightCodeInsightFixtureTestCase() { +public class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTestCase() { private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/highlightingWithDependentLibraries" - override fun getProjectDescriptor() = object : JetLightProjectDescriptor() { + override fun getProjectDescriptor() = object : KotlinLightProjectDescriptor() { override fun configureModule(module: Module, model: ModifiableRootModel) { val compiledJar1 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib1", "lib1", false) val compiledJar2 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", false, compiledJar1.canonicalPath) diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java index 645b008ea8d..087fa2d02d1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.caches.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true, "delegation"); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true, "delegation"); } @TestMetadata("annotationClass.kt") public void testAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/annotationClass.kt"); doTest(fileName); } @@ -46,24 +46,24 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class Facades extends AbstractIdeLightClassTest { public void testAllFilesPresentInFacades() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/facades"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EmptyFile.kt") public void testEmptyFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/EmptyFile.kt"); doTest(fileName); } @TestMetadata("SingleFile.kt") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleFile.kt"); doTest(fileName); } @TestMetadata("SingleJvmClassName.kt") public void testSingleJvmClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"); doTest(fileName); } } @@ -73,126 +73,126 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractIdeLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt"); doTest(fileName); } @TestMetadata("ClassObjectField.kt") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt"); doTest(fileName); } @TestMetadata("ClassWithConstructor.kt") public void testClassWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt"); doTest(fileName); } @TestMetadata("ClassWithConstructorAndProperties.kt") public void testClassWithConstructorAndProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt"); doTest(fileName); } @TestMetadata("FileFacade.kt") public void testFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt"); doTest(fileName); } @TestMetadata("Generic.kt") public void testGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt"); doTest(fileName); } @TestMetadata("IntOverridesAny.kt") public void testIntOverridesAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt"); doTest(fileName); } @TestMetadata("JvmOverloads.kt") public void testJvmOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt"); doTest(fileName); } @TestMetadata("NullableUnitReturn.kt") public void testNullableUnitReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt"); doTest(fileName); } @TestMetadata("OverrideAnyWithUnit.kt") public void testOverrideAnyWithUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt"); doTest(fileName); } @TestMetadata("PlatformTypes.kt") public void testPlatformTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt"); doTest(fileName); } @TestMetadata("Primitives.kt") public void testPrimitives() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt"); doTest(fileName); } @TestMetadata("PrivateInClass.kt") public void testPrivateInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt"); doTest(fileName); } @TestMetadata("PrivateInTrait.kt") public void testPrivateInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt"); doTest(fileName); } @TestMetadata("Synthetic.kt") public void testSynthetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt"); doTest(fileName); } @TestMetadata("TraitClassObjectField.kt") public void testTraitClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt"); doTest(fileName); } @TestMetadata("UnitAsGenericArgument.kt") public void testUnitAsGenericArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt"); doTest(fileName); } @TestMetadata("UnitParameter.kt") public void testUnitParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt"); doTest(fileName); } @TestMetadata("VoidReturn.kt") public void testVoidReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"); doTest(fileName); } } @@ -202,12 +202,12 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractIdeLightClassTest { public void testAllFilesPresentInObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/object"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("SimpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"); doTest(fileName); } } @@ -217,18 +217,18 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest { @RunWith(JUnit3RunnerWithInners.class) public static class PublicField extends AbstractIdeLightClassTest { public void testAllFilesPresentInPublicField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/publicField"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CompanionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/publicField/Simple.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt index 535fd67f71a..ec66a8e8554 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.test.dumpTextWithErrors import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public abstract class AbstractInsertImportOnPasteTest : AbstractCopyPasteTest() { @@ -69,13 +69,13 @@ public abstract class AbstractInsertImportOnPasteTest : AbstractCopyPasteTest() performNotWriteEditorAction(IdeActions.ACTION_PASTE) val namesToImportDump = KotlinCopyPasteReferenceProcessor.declarationsToImportSuggested.joinToString("\n") - JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.names")), namesToImportDump) + KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.names")), namesToImportDump) val resultFile = myFixture.getFile() as KtFile val resultText = if (InTextDirectivesUtils.isDirectiveDefined(testFileText, NO_ERRORS_DUMP_DIRECTIVE)) resultFile.getText() else resultFile.dumpTextWithErrors() - JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.kt")), resultText) + KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.kt")), resultText) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt index ec2d848c85c..e015cacb5b1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt @@ -30,8 +30,8 @@ import com.intellij.testFramework.InspectionTestUtil import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.test.InTextDirectivesUtils @@ -40,12 +40,12 @@ import java.io.File import kotlin.test.assertFalse import java.util.* -public abstract class AbstractInspectionTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase() { companion object { val ENTRY_POINT_ANNOTATION = "test.anno.EntryPoint" } - override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE override fun setUp() { super.setUp() diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java index c996ed8d876..07f36ac175e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java @@ -33,13 +33,13 @@ import com.intellij.testFramework.PlatformTestUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.ReferenceUtils; import org.jetbrains.kotlin.test.TagsTestDataUtil; import org.junit.Assert; @@ -49,7 +49,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractLineMarkersTest extends KotlinLightCodeInsightFixtureTestCase { private static final String LINE_MARKER_PREFIX = "LINEMARKER:"; private static final String TARGETS_PREFIX = "TARGETS"; @@ -62,7 +62,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } public void doTest(String path) { @@ -96,7 +96,7 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture catch (AssertionError error) { try { String actualTextWithTestData = TagsTestDataUtil.insertInfoTags(markers, true, myFixture.getFile().getText()); - JetTestUtils.assertEqualsToFile(new File(path), actualTextWithTestData); + KotlinTestUtils.assertEqualsToFile(new File(path), actualTextWithTestData); } catch (FileComparisonFailure failure) { throw new FileComparisonFailure(error.getMessage() + "\n" + failure.getMessage(), @@ -114,8 +114,8 @@ public abstract class AbstractLineMarkersTest extends JetLightCodeInsightFixture } private void assertNavigationElements(List markers) { - List navigationDataComments = JetTestUtils.getLastCommentsInFile( - (KtFile) myFixture.getFile(), JetTestUtils.CommentType.BLOCK_COMMENT, false); + List navigationDataComments = KotlinTestUtils.getLastCommentsInFile( + (KtFile) myFixture.getFile(), KotlinTestUtils.CommentType.BLOCK_COMMENT, false); if (navigationDataComments.isEmpty()) return; for (String navigationComment : navigationDataComments) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java index 2a008a679c2..c30727da04d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java @@ -22,14 +22,14 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiModificationTrackerImpl; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; import java.io.IOException; -public abstract class AbstractOutOfBlockModificationTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractOutOfBlockModificationTest extends KotlinLightCodeInsightFixtureTestCase { @Override public void setUp() { super.setUp(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt index 60d02c339d1..c3b222ab368 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt @@ -33,21 +33,21 @@ import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMembersHandler -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.dumpTextWithErrors import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TagsTestDataUtil import org.jetbrains.kotlin.utils.rethrow import org.junit.Assert import java.io.File import kotlin.test.assertEquals -public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixtureTestCase() { - override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE +public abstract class AbstractOverrideImplementTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE protected fun doImplementFileTest(memberToOverride: String? = null) { doFileTest(ImplementMembersHandler(), memberToOverride) @@ -202,7 +202,7 @@ public abstract class AbstractOverrideImplementTest : JetLightCodeInsightFixture myFixture.checkResultByFile(fileName) } catch (error: AssertionError) { - JetTestUtils.assertEqualsToFile(expectedFile, TagsTestDataUtil.generateTextWithCaretAndSelection(myFixture.editor)) + KotlinTestUtils.assertEqualsToFile(expectedFile, TagsTestDataUtil.generateTextWithCaretAndSelection(myFixture.editor)) } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java index 5e979c27023..189cb7d5646 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,342 +34,342 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast @RunWith(JUnit3RunnerWithInners.class) public static class Copy extends AbstractInsertImportOnPasteTest { public void testAllFilesPresentInCopy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); } @TestMetadata("AlreadyImportedExtensions.kt") public void testAlreadyImportedExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt"); doTestCopy(fileName); } @TestMetadata("AlreadyImportedViaStar.kt") public void testAlreadyImportedViaStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt"); doTestCopy(fileName); } @TestMetadata("ClassAlreadyImported.kt") public void testClassAlreadyImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt"); doTestCopy(fileName); } @TestMetadata("ClassMember.kt") public void testClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt"); doTestCopy(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt"); doTestCopy(fileName); } @TestMetadata("ClassObjectFunInsideClass.kt") public void testClassObjectFunInsideClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt"); doTestCopy(fileName); } @TestMetadata("ClassObjectInner.kt") public void testClassObjectInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt"); doTestCopy(fileName); } @TestMetadata("ClassResolvedToPackage.kt") public void testClassResolvedToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt"); doTestCopy(fileName); } @TestMetadata("ClassType.kt") public void testClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt"); doTestCopy(fileName); } @TestMetadata("ConflictForTypeWithTypeParameter.kt") public void testConflictForTypeWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt"); doTestCopy(fileName); } @TestMetadata("ConflictWithClass.kt") public void testConflictWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt"); doTestCopy(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt"); doTestCopy(fileName); } @TestMetadata("DeepInnerClasses.kt") public void testDeepInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt"); doTestCopy(fileName); } @TestMetadata("DefaultPackage.kt") public void testDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt"); doTestCopy(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt"); doTestCopy(fileName); } @TestMetadata("DependenciesNotAccessibleOnPaste.kt") public void testDependenciesNotAccessibleOnPaste() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt"); doTestCopy(fileName); } @TestMetadata("DependencyOnJava.kt") public void testDependencyOnJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt"); doTestCopy(fileName); } @TestMetadata("DependencyOnKotlinLibrary.kt") public void testDependencyOnKotlinLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt"); doTestCopy(fileName); } @TestMetadata("DependencyOnStdLib.kt") public void testDependencyOnStdLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt"); doTestCopy(fileName); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt"); doTestCopy(fileName); } @TestMetadata("Extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt"); doTestCopy(fileName); } @TestMetadata("ExtensionAsInfixOrOperator.kt") public void testExtensionAsInfixOrOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt"); doTestCopy(fileName); } @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt") public void testExtensionCannotBeImportedOrLengthened() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt"); doTestCopy(fileName); } @TestMetadata("ExtensionConflict.kt") public void testExtensionConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt"); doTestCopy(fileName); } @TestMetadata("ForLoop.kt") public void testForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt"); doTestCopy(fileName); } @TestMetadata("FullyQualified.kt") public void testFullyQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt"); doTestCopy(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt"); doTestCopy(fileName); } @TestMetadata("FunctionAlreadyImported.kt") public void testFunctionAlreadyImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt"); doTestCopy(fileName); } @TestMetadata("FunctionParameter.kt") public void testFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt"); doTestCopy(fileName); } @TestMetadata("GetExpression.kt") public void testGetExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt"); doTestCopy(fileName); } @TestMetadata("ImportDependency.kt") public void testImportDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt"); doTestCopy(fileName); } @TestMetadata("ImportDirective.kt") public void testImportDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt"); doTestCopy(fileName); } @TestMetadata("ImportableEntityInExtensionLiteral.kt") public void testImportableEntityInExtensionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt"); doTestCopy(fileName); } @TestMetadata("ImportedElementCopied.kt") public void testImportedElementCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt"); doTestCopy(fileName); } @TestMetadata("Inner.kt") public void testInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt"); doTestCopy(fileName); } @TestMetadata("Invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt"); doTestCopy(fileName); } @TestMetadata("JavaStaticViaClass.kt") public void testJavaStaticViaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt"); doTestCopy(fileName); } @TestMetadata("Local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt"); doTestCopy(fileName); } @TestMetadata("MultiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt"); doTestCopy(fileName); } @TestMetadata("MultiReferencePartiallyCopied.kt") public void testMultiReferencePartiallyCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt"); doTestCopy(fileName); } @TestMetadata("NoImportForBuiltIns.kt") public void testNoImportForBuiltIns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt"); doTestCopy(fileName); } @TestMetadata("NoImportForSamePackage.kt") public void testNoImportForSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt"); doTestCopy(fileName); } @TestMetadata("NotReferencePosition.kt") public void testNotReferencePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt"); doTestCopy(fileName); } @TestMetadata("NotReferencePosition2.kt") public void testNotReferencePosition2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt"); doTestCopy(fileName); } @TestMetadata("Object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt"); doTestCopy(fileName); } @TestMetadata("OverloadedExtensionFunction.kt") public void testOverloadedExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt"); doTestCopy(fileName); } @TestMetadata("PackageView.kt") public void testPackageView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt"); doTestCopy(fileName); } @TestMetadata("PartiallyQualified.kt") public void testPartiallyQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt"); doTestCopy(fileName); } @TestMetadata("QualifiedTypeConflict.kt") public void testQualifiedTypeConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt"); doTestCopy(fileName); } @TestMetadata("ReferencedElementAlsoCopied.kt") public void testReferencedElementAlsoCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt"); doTestCopy(fileName); } @TestMetadata("Super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt"); doTestCopy(fileName); } @TestMetadata("ThisReference.kt") public void testThisReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt"); doTestCopy(fileName); } @TestMetadata("TopLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt"); doTestCopy(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt"); doTestCopy(fileName); } @TestMetadata("TypeArgForUnresolvedCall.kt") public void testTypeArgForUnresolvedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt"); doTestCopy(fileName); } @TestMetadata("TypeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt"); doTestCopy(fileName); } } @@ -379,342 +379,342 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast @RunWith(JUnit3RunnerWithInners.class) public static class Cut extends AbstractInsertImportOnPasteTest { public void testAllFilesPresentInCut() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); } @TestMetadata("AlreadyImportedExtensions.kt") public void testAlreadyImportedExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedExtensions.kt"); doTestCut(fileName); } @TestMetadata("AlreadyImportedViaStar.kt") public void testAlreadyImportedViaStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt"); doTestCut(fileName); } @TestMetadata("ClassAlreadyImported.kt") public void testClassAlreadyImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt"); doTestCut(fileName); } @TestMetadata("ClassMember.kt") public void testClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt"); doTestCut(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt"); doTestCut(fileName); } @TestMetadata("ClassObjectFunInsideClass.kt") public void testClassObjectFunInsideClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt"); doTestCut(fileName); } @TestMetadata("ClassObjectInner.kt") public void testClassObjectInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt"); doTestCut(fileName); } @TestMetadata("ClassResolvedToPackage.kt") public void testClassResolvedToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt"); doTestCut(fileName); } @TestMetadata("ClassType.kt") public void testClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt"); doTestCut(fileName); } @TestMetadata("ConflictForTypeWithTypeParameter.kt") public void testConflictForTypeWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt"); doTestCut(fileName); } @TestMetadata("ConflictWithClass.kt") public void testConflictWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt"); doTestCut(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt"); doTestCut(fileName); } @TestMetadata("DeepInnerClasses.kt") public void testDeepInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt"); doTestCut(fileName); } @TestMetadata("DefaultPackage.kt") public void testDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt"); doTestCut(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt"); doTestCut(fileName); } @TestMetadata("DependenciesNotAccessibleOnPaste.kt") public void testDependenciesNotAccessibleOnPaste() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependenciesNotAccessibleOnPaste.kt"); doTestCut(fileName); } @TestMetadata("DependencyOnJava.kt") public void testDependencyOnJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt"); doTestCut(fileName); } @TestMetadata("DependencyOnKotlinLibrary.kt") public void testDependencyOnKotlinLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt"); doTestCut(fileName); } @TestMetadata("DependencyOnStdLib.kt") public void testDependencyOnStdLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt"); doTestCut(fileName); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt"); doTestCut(fileName); } @TestMetadata("Extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt"); doTestCut(fileName); } @TestMetadata("ExtensionAsInfixOrOperator.kt") public void testExtensionAsInfixOrOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt"); doTestCut(fileName); } @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt") public void testExtensionCannotBeImportedOrLengthened() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt"); doTestCut(fileName); } @TestMetadata("ExtensionConflict.kt") public void testExtensionConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt"); doTestCut(fileName); } @TestMetadata("ForLoop.kt") public void testForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt"); doTestCut(fileName); } @TestMetadata("FullyQualified.kt") public void testFullyQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt"); doTestCut(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt"); doTestCut(fileName); } @TestMetadata("FunctionAlreadyImported.kt") public void testFunctionAlreadyImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt"); doTestCut(fileName); } @TestMetadata("FunctionParameter.kt") public void testFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt"); doTestCut(fileName); } @TestMetadata("GetExpression.kt") public void testGetExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt"); doTestCut(fileName); } @TestMetadata("ImportDependency.kt") public void testImportDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt"); doTestCut(fileName); } @TestMetadata("ImportDirective.kt") public void testImportDirective() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt"); doTestCut(fileName); } @TestMetadata("ImportableEntityInExtensionLiteral.kt") public void testImportableEntityInExtensionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt"); doTestCut(fileName); } @TestMetadata("ImportedElementCopied.kt") public void testImportedElementCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt"); doTestCut(fileName); } @TestMetadata("Inner.kt") public void testInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt"); doTestCut(fileName); } @TestMetadata("Invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt"); doTestCut(fileName); } @TestMetadata("JavaStaticViaClass.kt") public void testJavaStaticViaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt"); doTestCut(fileName); } @TestMetadata("Local.kt") public void testLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt"); doTestCut(fileName); } @TestMetadata("MultiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt"); doTestCut(fileName); } @TestMetadata("MultiReferencePartiallyCopied.kt") public void testMultiReferencePartiallyCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt"); doTestCut(fileName); } @TestMetadata("NoImportForBuiltIns.kt") public void testNoImportForBuiltIns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt"); doTestCut(fileName); } @TestMetadata("NoImportForSamePackage.kt") public void testNoImportForSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt"); doTestCut(fileName); } @TestMetadata("NotReferencePosition.kt") public void testNotReferencePosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt"); doTestCut(fileName); } @TestMetadata("NotReferencePosition2.kt") public void testNotReferencePosition2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt"); doTestCut(fileName); } @TestMetadata("Object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt"); doTestCut(fileName); } @TestMetadata("OverloadedExtensionFunction.kt") public void testOverloadedExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/OverloadedExtensionFunction.kt"); doTestCut(fileName); } @TestMetadata("PackageView.kt") public void testPackageView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt"); doTestCut(fileName); } @TestMetadata("PartiallyQualified.kt") public void testPartiallyQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt"); doTestCut(fileName); } @TestMetadata("QualifiedTypeConflict.kt") public void testQualifiedTypeConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt"); doTestCut(fileName); } @TestMetadata("ReferencedElementAlsoCopied.kt") public void testReferencedElementAlsoCopied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt"); doTestCut(fileName); } @TestMetadata("Super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt"); doTestCut(fileName); } @TestMetadata("ThisReference.kt") public void testThisReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt"); doTestCut(fileName); } @TestMetadata("TopLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt"); doTestCut(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt"); doTestCut(fileName); } @TestMetadata("TypeArgForUnresolvedCall.kt") public void testTypeArgForUnresolvedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeArgForUnresolvedCall.kt"); doTestCut(fileName); } @TestMetadata("TypeParameter.kt") public void testTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt"); doTestCut(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java index bad3702faaa..1d09b0273a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,66 +28,66 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetInspectionTestGenerated extends AbstractJetInspectionTest { +public class InspectionTestGenerated extends AbstractInspectionTest { @TestMetadata("idea/testData/intentions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Intentions extends AbstractJetInspectionTest { + public static class Intentions extends AbstractInspectionTest { public void testAllFilesPresentInIntentions() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$")); } @TestMetadata("branched/ifThenToElvis/inspectionData/inspections.test") public void testBranched_ifThenToElvis_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("branched/ifThenToSafeAccess/inspectionData/inspections.test") public void testBranched_ifThenToSafeAccess_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test") public void testConventionNameCalls_replaceGetOrSet_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("convertToStringTemplate/inspectionData/inspections.test") public void testConvertToStringTemplate_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("deprecatedCallableAddReplaceWith/inspectionData/inspections.test") public void testDeprecatedCallableAddReplaceWith_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("objectLiteralToLambda/inspectionData/inspections.test") public void testObjectLiteralToLambda_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("removeExplicitSuperQualifier/inspectionData/inspections.test") public void testRemoveExplicitSuperQualifier_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("removeExplicitTypeArguments/inspectionData/inspections.test") public void testRemoveExplicitTypeArguments_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("simplifyNegatedBinaryExpression/inspectionData/inspections.test") public void testSimplifyNegatedBinaryExpression_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/inspections.test"); doTest(fileName); } } @@ -95,86 +95,86 @@ public class JetInspectionTestGenerated extends AbstractJetInspectionTest { @TestMetadata("idea/testData/inspections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Inspections extends AbstractJetInspectionTest { + public static class Inspections extends AbstractInspectionTest { public void testAllFilesPresentInInspections() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/inspections"), Pattern.compile("^(inspections\\.test)$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/inspections"), Pattern.compile("^(inspections\\.test)$")); } @TestMetadata("conflictingExtensionProperty/inspectionData/inspections.test") public void testConflictingExtensionProperty_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/conflictingExtensionProperty/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("equalsAndHashCode/inspectionData/inspections.test") public void testEqualsAndHashCode_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/equalsAndHashCode/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("redundantSamConstructor/inspectionData/inspections.test") public void testRedundantSamConstructor_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/redundantSamConstructor/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("spelling/inspectionData/inspections.test") public void testSpelling_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/spelling/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/spelling/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedImport/inspectionData/inspections.test") public void testUnusedImport_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedImport/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedImport/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedReceiverParameter/inspectionData/inspections.test") public void testUnusedReceiverParameter_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedReceiverParameter/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/class/inspectionData/inspections.test") public void testUnusedSymbol_class_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/class/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/function/inspectionData/inspections.test") public void testUnusedSymbol_function_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/function/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/js/inspectionData/inspections.test") public void testUnusedSymbol_js_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/js/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/object/inspectionData/inspections.test") public void testUnusedSymbol_object_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/object/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/parameter/inspectionData/inspections.test") public void testUnusedSymbol_parameter_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/parameter/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/property/inspectionData/inspections.test") public void testUnusedSymbol_property_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/property/inspectionData/inspections.test"); doTest(fileName); } @TestMetadata("unusedSymbol/typeParameter/inspectionData/inspections.test") public void testUnusedSymbol_typeParameter_inspectionData_Inspections_test() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspections/unusedSymbol/typeParameter/inspectionData/inspections.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java index eeb524bbdc0..8b69a3b6289 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LineMarkersTestGenerated extends AbstractLineMarkersTest { public void testAllFilesPresentInLineMarker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/codeInsight/lineMarker/overrideImplement") @@ -40,144 +40,144 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest { @RunWith(JUnit3RunnerWithInners.class) public static class OverrideImplement extends AbstractLineMarkersTest { public void testAllFilesPresentInOverrideImplement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/overrideImplement"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("BadCodeNoExceptions.kt") public void testBadCodeNoExceptions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt"); doTest(fileName); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt"); doTest(fileName); } @TestMetadata("ClassObjectInStaticNestedClass.kt") public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt"); doTest(fileName); } @TestMetadata("DelegatedFun.kt") public void testDelegatedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt"); doTest(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumEntry.kt") public void testEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt"); doTest(fileName); } @TestMetadata("FakeOverrideForClasses.kt") public void testFakeOverrideForClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt"); doTest(fileName); } @TestMetadata("FakeOverrideFun.kt") public void testFakeOverrideFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt"); doTest(fileName); } @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.kt") public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt"); doTest(fileName); } @TestMetadata("FakeOverrideProperty.kt") public void testFakeOverrideProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt"); doTest(fileName); } @TestMetadata("FakeOverrideToStringInTrait.kt") public void testFakeOverrideToStringInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt"); doTest(fileName); } @TestMetadata("FakeOverridesForTraitFunWithImpl.kt") public void testFakeOverridesForTraitFunWithImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt"); doTest(fileName); } @TestMetadata("NavigateToSeveralSuperElements.kt") public void testNavigateToSeveralSuperElements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt"); doTest(fileName); } @TestMetadata("NoOverridingMarkerOnDefaultTraitImpl.kt") public void testNoOverridingMarkerOnDefaultTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt"); doTest(fileName); } @TestMetadata("Overloads.kt") public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt"); doTest(fileName); } @TestMetadata("OverrideFunction.kt") public void testOverrideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt"); doTest(fileName); } @TestMetadata("OverrideIconForOverloadMethodBug.kt") public void testOverrideIconForOverloadMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt"); doTest(fileName); } @TestMetadata("OverrideMemberOfAbstractClass.kt") public void testOverrideMemberOfAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt"); doTest(fileName); } @TestMetadata("OverridenTraitDeclarations.kt") public void testOverridenTraitDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt"); doTest(fileName); } @TestMetadata("OverridingTooltipOnDefaultTraitImpl.kt") public void testOverridingTooltipOnDefaultTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt"); doTest(fileName); } @TestMetadata("PropertyOverride.kt") public void testPropertyOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt"); doTest(fileName); } @TestMetadata("ToStringInTrait.kt") public void testToStringInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt"); doTest(fileName); } } @@ -187,102 +187,102 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest { @RunWith(JUnit3RunnerWithInners.class) public static class RecursiveCall extends AbstractLineMarkersTest { public void testAllFilesPresentInRecursiveCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/recursiveCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/recursiveCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conventionCall.kt") public void testConventionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt"); doTest(fileName); } @TestMetadata("differentImplicitReceiver.kt") public void testDifferentImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/differentImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/extension.kt"); doTest(fileName); } @TestMetadata("generic.kt") public void testGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/generic.kt"); doTest(fileName); } @TestMetadata("inInlinedFunctionExpression.kt") public void testInInlinedFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedFunctionExpression.kt"); doTest(fileName); } @TestMetadata("inInlinedLambda.kt") public void testInInlinedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inInlinedLambda.kt"); doTest(fileName); } @TestMetadata("inLambda.kt") public void testInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/inLambda.kt"); doTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localClass.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/localFun.kt"); doTest(fileName); } @TestMetadata("methodReference.kt") public void testMethodReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/methodReference.kt"); doTest(fileName); } @TestMetadata("nested.kt") public void testNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/nested.kt"); doTest(fileName); } @TestMetadata("otherQualifier.kt") public void testOtherQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/otherQualifier.kt"); doTest(fileName); } @TestMetadata("severalCallsInOneLine.kt") public void testSeveralCallsInOneLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/severalCallsInOneLine.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/simple.kt"); doTest(fileName); } @TestMetadata("superQualifier.kt") public void testSuperQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt"); doTest(fileName); } @TestMetadata("thisQualifier.kt") public void testThisQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/recursiveCall/thisQualifier.kt"); doTest(fileName); } } @@ -292,18 +292,18 @@ public class LineMarkersTestGenerated extends AbstractLineMarkersTest { @RunWith(JUnit3RunnerWithInners.class) public static class RunMarkers extends AbstractLineMarkersTest { public void testAllFilesPresentInRunMarkers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/runMarkers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/lineMarker/runMarkers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("jUnitTestClassWithSubclasses.kt") public void testJUnitTestClassWithSubclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt"); doTest(fileName); } @TestMetadata("testNGTestClassWithSubclasses.kt") public void testTestNGTestClassWithSubclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt index ef33dfbe3c9..b1cb123d3b8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.codeInsight import com.intellij.codeInsight.template.TemplateContextType import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import java.io.File -public class LiveTemplatesContextTest : JetLightCodeInsightFixtureTestCase() { +public class LiveTemplatesContextTest : KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String = File(PluginTestCaseBase.getTestDataPathBase(), "/templates/context").getPath() + File.separator diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java index f24b392cce3..f389990a25e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java @@ -32,15 +32,15 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; import java.util.ArrayList; import java.util.Arrays; -public class LiveTemplatesTest extends JetLightCodeInsightFixtureTestCase { +public class LiveTemplatesTest extends KotlinLightCodeInsightFixtureTestCase { @Override protected void setUp() { super.setUp(); @@ -305,7 +305,7 @@ public class LiveTemplatesTest extends JetLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } private void doAction(@NotNull String actionId) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java index 2501653a267..9aedbebea0e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/MultiFileInspectionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,20 +30,20 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/multiFileInspections") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetMultiFileInspectionTestGenerated extends AbstractJetMultiFileInspectionTest { +public class MultiFileInspectionTestGenerated extends AbstractMultiFileInspectionTest { public void testAllFilesPresentInMultiFileInspections() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileInspections"), Pattern.compile("^(.+)\\.test$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileInspections"), Pattern.compile("^(.+)\\.test$")); } @TestMetadata("invalidBundleOrProperty/invalidBundleOrProperty.test") public void testInvalidBundleOrProperty_InvalidBundleOrProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/invalidBundleOrProperty/invalidBundleOrProperty.test"); doTest(fileName); } @TestMetadata("mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test") public void testMismatchedProjectAndDirectory_MismatchedProjectAndDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileInspections/mismatchedProjectAndDirectory/mismatchedProjectAndDirectory.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java index 286fc63f788..996cd1fa3d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,198 +32,198 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest { public void testAllFilesPresentInOutOfBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class_Class_FunNoType_Block.kt") public void testClass_Class_FunNoType_Block() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block.kt"); doTest(fileName); } @TestMetadata("Class_Class_FunNoType_Block_Expression.kt") public void testClass_Class_FunNoType_Block_Expression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Class_Class_FunNoType_Block_Expression.kt"); doTest(fileName); } @TestMetadata("FunInFun.kt") public void testFunInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt"); doTest(fileName); } @TestMetadata("FunNoBody.kt") public void testFunNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt"); doTest(fileName); } @TestMetadata("FunNoType_Block.kt") public void testFunNoType_Block() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block.kt"); doTest(fileName); } @TestMetadata("FunNoType_Block_Class.kt") public void testFunNoType_Block_Class() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoType_Block_Class.kt"); doTest(fileName); } @TestMetadata("FunWithType_Initializer.kt") public void testFunWithType_Initializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer.kt"); doTest(fileName); } @TestMetadata("FunWithType_Initializer_Expression.kt") public void testFunWithType_Initializer_Expression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunWithType_Initializer_Expression.kt"); doTest(fileName); } @TestMetadata("InAntonymsObjectDeclaration.kt") public void testInAntonymsObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt"); doTest(fileName); } @TestMetadata("InClass.kt") public void testInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt"); doTest(fileName); } @TestMetadata("InClassInClass.kt") public void testInClassInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassInClass.kt"); doTest(fileName); } @TestMetadata("InClassPropertyAccessor.kt") public void testInClassPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt"); doTest(fileName); } @TestMetadata("InFunInFunWithBody.kt") public void testInFunInFunWithBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt"); doTest(fileName); } @TestMetadata("InFunInFunctionInitializerInFun.kt") public void testInFunInFunctionInitializerInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunctionInitializerInFun.kt"); doTest(fileName); } @TestMetadata("InFunInMultiDeclaration.kt") public void testInFunInMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt"); doTest(fileName); } @TestMetadata("InFunInProperty.kt") public void testInFunInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInProperty.kt"); doTest(fileName); } @TestMetadata("InFunInPropertyInObjectLiteral.kt") public void testInFunInPropertyInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInPropertyInObjectLiteral.kt"); doTest(fileName); } @TestMetadata("InFunObjectLiteral.kt") public void testInFunObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunObjectLiteral.kt"); doTest(fileName); } @TestMetadata("InFunWithInference.kt") public void testInFunWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt"); doTest(fileName); } @TestMetadata("InFunctionLiteral.kt") public void testInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("InGlobalPropertyWithGetter.kt") public void testInGlobalPropertyWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt"); doTest(fileName); } @TestMetadata("InMethod.kt") public void testInMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt"); doTest(fileName); } @TestMetadata("InPropertyAccessorWithInference.kt") public void testInPropertyAccessorWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt"); doTest(fileName); } @TestMetadata("InPropertyWithFunctionLiteral.kt") public void testInPropertyWithFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("InPropertyWithInference.kt") public void testInPropertyWithInference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt"); doTest(fileName); } @TestMetadata("Object_FunNoType_Block.kt") public void testObject_FunNoType_Block() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block.kt"); doTest(fileName); } @TestMetadata("Object_FunNoType_Block_Expression.kt") public void testObject_FunNoType_Block_Expression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/Object_FunNoType_Block_Expression.kt"); doTest(fileName); } @TestMetadata("PropNotNullType_Initializer_ObjectLiteral_Fun.kt") public void testPropNotNullType_Initializer_ObjectLiteral_Fun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNotNullType_Initializer_ObjectLiteral_Fun.kt"); doTest(fileName); } @TestMetadata("PropNullType_Initializer_If_Fun.kt") public void testPropNullType_Initializer_If_Fun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_If_Fun.kt"); doTest(fileName); } @TestMetadata("PropNullType_Initializer_ObjectLiteral_Fun.kt") public void testPropNullType_Initializer_ObjectLiteral_Fun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropNullType_Initializer_ObjectLiteral_Fun.kt"); doTest(fileName); } @TestMetadata("PropertyNoType_Initializer_String.kt") public void testPropertyNoType_Initializer_String() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyNoType_Initializer_String.kt"); doTest(fileName); } @TestMetadata("PropertyWithType_Initializer_String.kt") public void testPropertyWithType_Initializer_String() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/PropertyWithType_Initializer_String.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt index f1247c4c1f4..58b311cc61e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt @@ -25,13 +25,13 @@ import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.TestActionEvent import junit.framework.TestCase import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -abstract class AbstractCodeInsightActionTest : JetLightCodeInsightFixtureTestCase() { +abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTestCase() { protected open fun createAction(fileText: String): CodeInsightAction { val actionClassName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// ACTION_CLASS: ") return Class.forName(actionClassName).newInstance() as CodeInsightAction @@ -86,12 +86,12 @@ abstract class AbstractCodeInsightActionTest : JetLightCodeInsightFixtureTestCas } } catch (e: CommonRefactoringUtil.RefactoringErrorHintException) { - JetTestUtils.assertEqualsToFile(conflictFile, e.getMessage()!!) + KotlinTestUtils.assertEqualsToFile(conflictFile, e.getMessage()!!) } finally { ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText) } } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java index 4f76f3ce68e..c8e0d83c656 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/CodeInsightActionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,78 +32,78 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CodeInsightActionTestGenerated extends AbstractCodeInsightActionTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/empty.kt"); doTest(fileName); } @TestMetadata("emptyExists.kt") public void testEmptyExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/emptyExists.kt"); doTest(fileName); } @TestMetadata("javaSupers.kt") public void testJavaSupers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupers.kt"); doTest(fileName); } @TestMetadata("javaSupersWithGenerics.kt") public void testJavaSupersWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/javaSupersWithGenerics.kt"); doTest(fileName); } @TestMetadata("primaryExists.kt") public void testPrimaryExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/primaryExists.kt"); doTest(fileName); } @TestMetadata("properties.kt") public void testProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/properties.kt"); doTest(fileName); } @TestMetadata("propertiesWithSupers.kt") public void testPropertiesWithSupers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/propertiesWithSupers.kt"); doTest(fileName); } @TestMetadata("supers.kt") public void testSupers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supers.kt"); doTest(fileName); } @TestMetadata("supersAllExist.kt") public void testSupersAllExist() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersAllExist.kt"); doTest(fileName); } @TestMetadata("supersSomeExist.kt") public void testSupersSomeExist() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersSomeExist.kt"); doTest(fileName); } @TestMetadata("supersWithGenerics.kt") public void testSupersWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithGenerics.kt"); doTest(fileName); } @TestMetadata("supersWithVarargs.kt") public void testSupersWithVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/secondaryConstructors/supersWithVarargs.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java index 5ae6765f70b..d703a7a0c04 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateHashCodeAndEqualsActionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,120 +32,120 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class GenerateHashCodeAndEqualsActionTestGenerated extends AbstractGenerateHashCodeAndEqualsActionTest { public void testAllFilesPresentInEqualsWithHashCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/equalsWithHashCode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/equalsWithHashCode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/annotation.kt"); doTest(fileName); } @TestMetadata("dataClass.kt") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/dataClass.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/enum.kt"); doTest(fileName); } @TestMetadata("genericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt"); doTest(fileName); } @TestMetadata("genericClassWithIsCheck.kt") public void testGenericClassWithIsCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/genericClassWithIsCheck.kt"); doTest(fileName); } @TestMetadata("interface.kt") public void testInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/interface.kt"); doTest(fileName); } @TestMetadata("multipleVars.kt") public void testMultipleVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt"); doTest(fileName); } @TestMetadata("multipleVarsNullable.kt") public void testMultipleVarsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt"); doTest(fileName); } @TestMetadata("multipleVarsWithSuperClass.kt") public void testMultipleVarsWithSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt"); doTest(fileName); } @TestMetadata("nameClash.kt") public void testNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt"); doTest(fileName); } @TestMetadata("noVars.kt") public void testNoVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVars.kt"); doTest(fileName); } @TestMetadata("noVarsForced.kt") public void testNoVarsForced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForced.kt"); doTest(fileName); } @TestMetadata("noVarsForcedWithSuperClass.kt") public void testNoVarsForcedWithSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/noVarsForcedWithSuperClass.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/object.kt"); doTest(fileName); } @TestMetadata("singleVar.kt") public void testSingleVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt"); doTest(fileName); } @TestMetadata("singleVarNullable.kt") public void testSingleVarNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt"); doTest(fileName); } @TestMetadata("singleVarWithIsCheck.kt") public void testSingleVarWithIsCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithIsCheck.kt"); doTest(fileName); } @TestMetadata("singleVarWithJavaSuperClass.kt") public void testSingleVarWithJavaSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt"); doTest(fileName); } @TestMetadata("singleVarWithSuperClass.kt") public void testSingleVarWithSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java index b7738f58787..4f968d0adb8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/GenerateTestSupportMethodActionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.generate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenerateTestSupportMethodActionTest { public void testAllFilesPresentInTestFrameworkSupport() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4") @@ -40,48 +40,48 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera @RunWith(JUnit3RunnerWithInners.class) public static class JUnit4 extends AbstractGenerateTestSupportMethodActionTest { public void testAllFilesPresentInJUnit4() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataMethod.kt") public void testDataMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt"); doTest(fileName); } @TestMetadata("setUp.kt") public void testSetUp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt"); doTest(fileName); } @TestMetadata("setUpExists.kt") public void testSetUpExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpExists.kt"); doTest(fileName); } @TestMetadata("setUpOverrides.kt") public void testSetUpOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUpOverrides.kt"); doTest(fileName); } @TestMetadata("tearDown.kt") public void testTearDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt"); doTest(fileName); } @TestMetadata("tearDownExists.kt") public void testTearDownExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDownExists.kt"); doTest(fileName); } @TestMetadata("testMethod.kt") public void testTestMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt"); doTest(fileName); } } @@ -91,36 +91,36 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera @RunWith(JUnit3RunnerWithInners.class) public static class Junit3 extends AbstractGenerateTestSupportMethodActionTest { public void testAllFilesPresentInJunit3() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/junit3"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/junit3"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("setUp.kt") public void testSetUp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUp.kt"); doTest(fileName); } @TestMetadata("setUpExists.kt") public void testSetUpExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/setUpExists.kt"); doTest(fileName); } @TestMetadata("tearDown.kt") public void testTearDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDown.kt"); doTest(fileName); } @TestMetadata("tearDownExists.kt") public void testTearDownExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/tearDownExists.kt"); doTest(fileName); } @TestMetadata("testMethod.kt") public void testTestMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt"); doTest(fileName); } } @@ -130,48 +130,48 @@ public class GenerateTestSupportMethodActionTestGenerated extends AbstractGenera @RunWith(JUnit3RunnerWithInners.class) public static class TestNG extends AbstractGenerateTestSupportMethodActionTest { public void testAllFilesPresentInTestNG() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/testNG"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/generate/testFrameworkSupport/testNG"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataMethod.kt") public void testDataMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt"); doTest(fileName); } @TestMetadata("setUp.kt") public void testSetUp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt"); doTest(fileName); } @TestMetadata("setUpExists.kt") public void testSetUpExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpExists.kt"); doTest(fileName); } @TestMetadata("setUpOverrides.kt") public void testSetUpOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/setUpOverrides.kt"); doTest(fileName); } @TestMetadata("tearDown.kt") public void testTearDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt"); doTest(fileName); } @TestMetadata("tearDownExists.kt") public void testTearDownExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDownExists.kt"); doTest(fileName); } @TestMetadata("testMethod.kt") public void testTestMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java index eaae7ea8601..d1ea9b7904a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.moveUpDown; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +34,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassBodyDeclarations extends AbstractCodeMoverTest { public void testAllFilesPresentInClassBodyDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors") @@ -43,30 +43,30 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { public static class Accessors extends AbstractCodeMoverTest { @TestMetadata("accessor1.kt") public void testAccessor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("accessor2.kt") public void testAccessor2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("accessor3.kt") public void testAccessor3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("accessor4.kt") public void testAccessor4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt"); doTestClassBodyDeclaration(fileName); } public void testAllFilesPresentInAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors"), Pattern.compile("^(.+)\\.kt$"), true); } } @@ -75,126 +75,126 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractCodeMoverTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classAtBrace1.kt") public void testClassAtBrace1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtBrace2.kt") public void testClassAtBrace2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtBrace3.kt") public void testClassAtBrace3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtBrace4.kt") public void testClassAtBrace4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtBrace5.kt") public void testClassAtBrace5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtBrace6.kt") public void testClassAtBrace6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtClass1.kt") public void testClassAtClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtClass2.kt") public void testClassAtClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtClassInitializer1.kt") public void testClassAtClassInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtClassInitializer2.kt") public void testClassAtClassInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtEmptyLine1.kt") public void testClassAtEmptyLine1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtEmptyLine2.kt") public void testClassAtEmptyLine2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtFunction1.kt") public void testClassAtFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtFunction2.kt") public void testClassAtFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtProperty1.kt") public void testClassAtProperty1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classAtProperty2.kt") public void testClassAtProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classWithoutBody1.kt") public void testClassWithoutBody1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classWithoutBody2.kt") public void testClassWithoutBody2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classWithoutBody3.kt") public void testClassWithoutBody3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classWithoutBody4.kt") public void testClassWithoutBody4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody4.kt"); doTestClassBodyDeclaration(fileName); } } @@ -204,78 +204,78 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassInitializer extends AbstractCodeMoverTest { public void testAllFilesPresentInClassInitializer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classInitializerAtBrace1.kt") public void testClassInitializerAtBrace1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtBrace2.kt") public void testClassInitializerAtBrace2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtClass1.kt") public void testClassInitializerAtClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtClass2.kt") public void testClassInitializerAtClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtClassInitializer1.kt") public void testClassInitializerAtClassInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtClassInitializer2.kt") public void testClassInitializerAtClassInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtEmptyLine1.kt") public void testClassInitializerAtEmptyLine1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtEmptyLine2.kt") public void testClassInitializerAtEmptyLine2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtFunction1.kt") public void testClassInitializerAtFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtFunction2.kt") public void testClassInitializerAtFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtProperty1.kt") public void testClassInitializerAtProperty1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("classInitializerAtProperty2.kt") public void testClassInitializerAtProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt"); doTestClassBodyDeclaration(fileName); } } @@ -285,54 +285,54 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Enums extends AbstractCodeMoverTest { public void testAllFilesPresentInEnums() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enum1.kt") public void testEnum1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum2.kt") public void testEnum2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum3.kt") public void testEnum3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum4.kt") public void testEnum4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum4.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum5.kt") public void testEnum5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum5.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum6.kt") public void testEnum6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum6.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum7.kt") public void testEnum7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum7.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("enum8.kt") public void testEnum8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum8.kt"); doTestClassBodyDeclaration(fileName); } } @@ -342,102 +342,102 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractCodeMoverTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionAtBrace1.kt") public void testFunctionAtBrace1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtBrace2.kt") public void testFunctionAtBrace2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtBrace3.kt") public void testFunctionAtBrace3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtBrace4.kt") public void testFunctionAtBrace4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtBrace5.kt") public void testFunctionAtBrace5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtBrace6.kt") public void testFunctionAtBrace6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtClass1.kt") public void testFunctionAtClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtClass2.kt") public void testFunctionAtClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtClassInitializer1.kt") public void testFunctionAtClassInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtClassInitializer2.kt") public void testFunctionAtClassInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtEmptyLine1.kt") public void testFunctionAtEmptyLine1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtEmptyLine2.kt") public void testFunctionAtEmptyLine2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtFunction1.kt") public void testFunctionAtFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtFunction2.kt") public void testFunctionAtFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtProperty1.kt") public void testFunctionAtProperty1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("functionAtProperty2.kt") public void testFunctionAtProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty2.kt"); doTestClassBodyDeclaration(fileName); } } @@ -447,42 +447,42 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionAnchors extends AbstractCodeMoverTest { public void testAllFilesPresentInFunctionAnchors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("keyword.kt") public void testKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("name.kt") public void testName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("returnType.kt") public void testReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("typeParams1.kt") public void testTypeParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("typeParams2.kt") public void testTypeParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("typeParams3.kt") public void testTypeParams3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt"); doTestClassBodyDeclaration(fileName); } } @@ -492,102 +492,102 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractCodeMoverTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("propertyAtBrace1.kt") public void testPropertyAtBrace1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtBrace2.kt") public void testPropertyAtBrace2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtBrace3.kt") public void testPropertyAtBrace3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace3.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtBrace4.kt") public void testPropertyAtBrace4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtBrace5.kt") public void testPropertyAtBrace5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace5.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtBrace6.kt") public void testPropertyAtBrace6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtClass1.kt") public void testPropertyAtClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtClass2.kt") public void testPropertyAtClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtClassInitializer1.kt") public void testPropertyAtClassInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtClassInitializer2.kt") public void testPropertyAtClassInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtEmptyLine1.kt") public void testPropertyAtEmptyLine1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtEmptyLine2.kt") public void testPropertyAtEmptyLine2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtFunction1.kt") public void testPropertyAtFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtFunction2.kt") public void testPropertyAtFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction2.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtProperty1.kt") public void testPropertyAtProperty1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty1.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("propertyAtProperty2.kt") public void testPropertyAtProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty2.kt"); doTestClassBodyDeclaration(fileName); } } @@ -597,24 +597,24 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class PropertyAnchors extends AbstractCodeMoverTest { public void testAllFilesPresentInPropertyAnchors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("keyword.kt") public void testKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("name.kt") public void testName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt"); doTestClassBodyDeclaration(fileName); } @TestMetadata("returnType.kt") public void testReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt"); doTestClassBodyDeclaration(fileName); } } @@ -625,7 +625,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClosingBraces extends AbstractCodeMoverTest { public void testAllFilesPresentInClosingBraces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for") @@ -633,18 +633,18 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class For extends AbstractCodeMoverTest { public void testAllFilesPresentInFor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/for"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/for"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("for1.kt") public void testFor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for1.kt"); doTestExpression(fileName); } @TestMetadata("for2.kt") public void testFor2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for2.kt"); doTestExpression(fileName); } } @@ -654,30 +654,30 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractCodeMoverTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("function1.kt") public void testFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function1.kt"); doTestExpression(fileName); } @TestMetadata("function2.kt") public void testFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function2.kt"); doTestExpression(fileName); } @TestMetadata("function3.kt") public void testFunction3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function3.kt"); doTestExpression(fileName); } @TestMetadata("function4.kt") public void testFunction4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function4.kt"); doTestExpression(fileName); } } @@ -687,30 +687,30 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class If extends AbstractCodeMoverTest { public void testAllFilesPresentInIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/if"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/if"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("if1.kt") public void testIf1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if1.kt"); doTestExpression(fileName); } @TestMetadata("if2.kt") public void testIf2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if2.kt"); doTestExpression(fileName); } @TestMetadata("if3.kt") public void testIf3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if3.kt"); doTestExpression(fileName); } @TestMetadata("if4.kt") public void testIf4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if4.kt"); doTestExpression(fileName); } } @@ -720,18 +720,18 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Nested extends AbstractCodeMoverTest { public void testAllFilesPresentInNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/nested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/nested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nested1.kt") public void testNested1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested1.kt"); doTestExpression(fileName); } @TestMetadata("nested2.kt") public void testNested2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested2.kt"); doTestExpression(fileName); } } @@ -741,42 +741,42 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractCodeMoverTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("when1.kt") public void testWhen1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when1.kt"); doTestExpression(fileName); } @TestMetadata("when2.kt") public void testWhen2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when2.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry1.kt") public void testWhenEntry1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry1.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry2.kt") public void testWhenEntry2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry2.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry3.kt") public void testWhenEntry3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry3.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry4.kt") public void testWhenEntry4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry4.kt"); doTestExpression(fileName); } } @@ -786,30 +786,30 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class While extends AbstractCodeMoverTest { public void testAllFilesPresentInWhile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/while"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/while"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("while1.kt") public void testWhile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while1.kt"); doTestExpression(fileName); } @TestMetadata("while2.kt") public void testWhile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while2.kt"); doTestExpression(fileName); } @TestMetadata("while3.kt") public void testWhile3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while3.kt"); doTestExpression(fileName); } @TestMetadata("while4.kt") public void testWhile4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while4.kt"); doTestExpression(fileName); } } @@ -820,408 +820,408 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractCodeMoverTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryExpr1.kt") public void testBinaryExpr1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt"); doTestExpression(fileName); } @TestMetadata("binaryExpr2.kt") public void testBinaryExpr2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt"); doTestExpression(fileName); } @TestMetadata("closureBlockBoundary1.kt") public void testClosureBlockBoundary1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary1.kt"); doTestExpression(fileName); } @TestMetadata("closureBlockBoundary2.kt") public void testClosureBlockBoundary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary2.kt"); doTestExpression(fileName); } @TestMetadata("closureInDoWhile1.kt") public void testClosureInDoWhile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile1.kt"); doTestExpression(fileName); } @TestMetadata("closureInDoWhile2.kt") public void testClosureInDoWhile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile2.kt"); doTestExpression(fileName); } @TestMetadata("closureInFor1.kt") public void testClosureInFor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor1.kt"); doTestExpression(fileName); } @TestMetadata("closureInFor2.kt") public void testClosureInFor2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor2.kt"); doTestExpression(fileName); } @TestMetadata("closureInIf1.kt") public void testClosureInIf1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf1.kt"); doTestExpression(fileName); } @TestMetadata("closureInIf2.kt") public void testClosureInIf2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf2.kt"); doTestExpression(fileName); } @TestMetadata("closureInWhile1.kt") public void testClosureInWhile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile1.kt"); doTestExpression(fileName); } @TestMetadata("closureInWhile2.kt") public void testClosureInWhile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile2.kt"); doTestExpression(fileName); } @TestMetadata("closureWthoutSpaces1.kt") public void testClosureWthoutSpaces1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces1.kt"); doTestExpression(fileName); } @TestMetadata("closureWthoutSpaces2.kt") public void testClosureWthoutSpaces2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces2.kt"); doTestExpression(fileName); } @TestMetadata("declaration1.kt") public void testDeclaration1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration1.kt"); doTestExpression(fileName); } @TestMetadata("declaration2.kt") public void testDeclaration2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration2.kt"); doTestExpression(fileName); } @TestMetadata("If1.kt") public void testIf1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/If1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/If1.kt"); doTestExpression(fileName); } @TestMetadata("if2.kt") public void testIf2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if2.kt"); doTestExpression(fileName); } @TestMetadata("if3.kt") public void testIf3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if3.kt"); doTestExpression(fileName); } @TestMetadata("if4.kt") public void testIf4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if4.kt"); doTestExpression(fileName); } @TestMetadata("ifExprToBlock1.kt") public void testIfExprToBlock1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt"); doTestExpression(fileName); } @TestMetadata("ifExprToBlock2.kt") public void testIfExprToBlock2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt"); doTestExpression(fileName); } @TestMetadata("ifToBlock1.kt") public void testIfToBlock1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt"); doTestExpression(fileName); } @TestMetadata("ifToBlock2.kt") public void testIfToBlock2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt"); doTestExpression(fileName); } @TestMetadata("insideExpression1.kt") public void testInsideExpression1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt"); doTestExpression(fileName); } @TestMetadata("insideExpression2.kt") public void testInsideExpression2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression2.kt"); doTestExpression(fileName); } @TestMetadata("insideExpression3.kt") public void testInsideExpression3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt"); doTestExpression(fileName); } @TestMetadata("insideExpression4.kt") public void testInsideExpression4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression4.kt"); doTestExpression(fileName); } @TestMetadata("intoClosure1.kt") public void testIntoClosure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure1.kt"); doTestExpression(fileName); } @TestMetadata("intoClosure2.kt") public void testIntoClosure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure2.kt"); doTestExpression(fileName); } @TestMetadata("intoClosureWithParams1.kt") public void testIntoClosureWithParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosureWithParams1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosureWithParams1.kt"); doTestExpression(fileName); } @TestMetadata("intoElse1.kt") public void testIntoElse1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse1.kt"); doTestExpression(fileName); } @TestMetadata("intoElse2.kt") public void testIntoElse2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse2.kt"); doTestExpression(fileName); } @TestMetadata("intoNestedClosure1.kt") public void testIntoNestedClosure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure1.kt"); doTestExpression(fileName); } @TestMetadata("intoNestedClosure2.kt") public void testIntoNestedClosure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure2.kt"); doTestExpression(fileName); } @TestMetadata("intoNestedClosureWithParams1.kt") public void testIntoNestedClosureWithParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosureWithParams1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosureWithParams1.kt"); doTestExpression(fileName); } @TestMetadata("lambda1.kt") public void testLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda1.kt"); doTestExpression(fileName); } @TestMetadata("lambda2.kt") public void testLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda2.kt"); doTestExpression(fileName); } @TestMetadata("lambda3.kt") public void testLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda3.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment1.kt") public void testMultilineComment1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment1.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment2.kt") public void testMultilineComment2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment2.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment3.kt") public void testMultilineComment3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment3.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment4.kt") public void testMultilineComment4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment4.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment5.kt") public void testMultilineComment5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment5.kt"); doTestExpression(fileName); } @TestMetadata("multilineComment6.kt") public void testMultilineComment6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment6.kt"); doTestExpression(fileName); } @TestMetadata("outOfClosure1.kt") public void testOutOfClosure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure1.kt"); doTestExpression(fileName); } @TestMetadata("outOfClosure2.kt") public void testOutOfClosure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure2.kt"); doTestExpression(fileName); } @TestMetadata("outOfClosureWithParams1.kt") public void testOutOfClosureWithParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosureWithParams1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosureWithParams1.kt"); doTestExpression(fileName); } @TestMetadata("outOfElse1.kt") public void testOutOfElse1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse1.kt"); doTestExpression(fileName); } @TestMetadata("outOfElse2.kt") public void testOutOfElse2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse2.kt"); doTestExpression(fileName); } @TestMetadata("outOfNestedClosure1.kt") public void testOutOfNestedClosure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure1.kt"); doTestExpression(fileName); } @TestMetadata("outOfNestedClosure2.kt") public void testOutOfNestedClosure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure2.kt"); doTestExpression(fileName); } @TestMetadata("outOfNestedClosureWithParams1.kt") public void testOutOfNestedClosureWithParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosureWithParams1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosureWithParams1.kt"); doTestExpression(fileName); } @TestMetadata("qualifiedCall1.kt") public void testQualifiedCall1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt"); doTestExpression(fileName); } @TestMetadata("qualifiedCall2.kt") public void testQualifiedCall2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt"); doTestExpression(fileName); } @TestMetadata("when1.kt") public void testWhen1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when1.kt"); doTestExpression(fileName); } @TestMetadata("when2.kt") public void testWhen2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when2.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry1.kt") public void testWhenEntry1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry1.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry2.kt") public void testWhenEntry2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry2.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry3.kt") public void testWhenEntry3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry3.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry4.kt") public void testWhenEntry4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry4.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry5.kt") public void testWhenEntry5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry5.kt"); doTestExpression(fileName); } @TestMetadata("whenEntry6.kt") public void testWhenEntry6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry6.kt"); doTestExpression(fileName); } @TestMetadata("while1.kt") public void testWhile1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while1.kt"); doTestExpression(fileName); } @TestMetadata("while2.kt") public void testWhile2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while2.kt"); doTestExpression(fileName); } @TestMetadata("whileToBlock1.kt") public void testWhileToBlock1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt"); doTestExpression(fileName); } @TestMetadata("whileToBlock2.kt") public void testWhileToBlock2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt"); doTestExpression(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt index 6f4d263d85b..61efad1e269 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt @@ -20,9 +20,9 @@ import com.intellij.openapi.actionSystem.IdeActions import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase -class SmartEnterTest : JetLightCodeInsightFixtureTestCase() { +class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() { fun testIfCondition() = doFunTest( """ if diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java index 67fb0fcd459..2b1c232d147 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.surroundWith; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,42 +34,42 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class If extends AbstractSurroundWithTest { public void testAllFilesPresentInIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("block.kt") public void testBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("emptyLine.kt") public void testEmptyLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/emptyLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/emptyLine.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("severalStatements.kt") public void testSeveralStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("singleStatement.kt") public void testSingleStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("singleStatementAtCaret.kt") public void testSingleStatementAtCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("variable.kt") public void testVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt"); doTestWithIfSurrounder(fileName); } @@ -78,7 +78,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class MoveDeclarationsOut extends AbstractSurroundWithTest { public void testAllFilesPresentInMoveDeclarationsOut() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class") @@ -86,18 +86,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractSurroundWithTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classInType.kt") public void testClassInType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt"); doTestWithIfSurrounder(fileName); } } @@ -107,24 +107,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractSurroundWithTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("firstChildLocalFun.kt") public void testFirstChildLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("unusedLocalFun.kt") public void testUnusedLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt"); doTestWithIfSurrounder(fileName); } } @@ -134,12 +134,12 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Object extends AbstractSurroundWithTest { public void testAllFilesPresentInObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localObject.kt") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt"); doTestWithIfSurrounder(fileName); } } @@ -149,24 +149,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Order extends AbstractSurroundWithTest { public void testAllFilesPresentInOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("twoClasses.kt") public void testTwoClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("valAndClass.kt") public void testValAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("valOrder.kt") public void testValOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt"); doTestWithIfSurrounder(fileName); } } @@ -176,36 +176,36 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Val extends AbstractSurroundWithTest { public void testAllFilesPresentInVal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fullQualifiedType.kt") public void testFullQualifiedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("fullQualifiedTypeWithoutTypeRef.kt") public void testFullQualifiedTypeWithoutTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("valWithTypeWithInitializer.kt") public void testValWithTypeWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("valWithTypeWoInitializer.kt") public void testValWithTypeWoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("valWoTypeWithInitializer.kt") public void testValWoTypeWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt"); doTestWithIfSurrounder(fileName); } } @@ -215,24 +215,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Var extends AbstractSurroundWithTest { public void testAllFilesPresentInVar() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("varWithNotNullableTypeWithInitializer.kt") public void testVarWithNotNullableTypeWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("varWithTypeWoInitializer.kt") public void testVarWithTypeWoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("varWoTypeWithInitializer.kt") public void testVarWoTypeWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt"); doTestWithIfSurrounder(fileName); } @@ -241,24 +241,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValue extends AbstractSurroundWithTest { public void testAllFilesPresentInDefaultValue() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boolean.kt") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt"); doTestWithIfSurrounder(fileName); } @TestMetadata("primitiveNumbers.kt") public void testPrimitiveNumbers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt"); doTestWithIfSurrounder(fileName); } } @@ -271,48 +271,48 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfElse extends AbstractSurroundWithTest { public void testAllFilesPresentInIfElse() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("block.kt") public void testBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("moveDeclarationsOutVal.kt") public void testMoveDeclarationsOutVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("moveDeclarationsOutVar.kt") public void testMoveDeclarationsOutVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("severalStatements.kt") public void testSeveralStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("singleStatement.kt") public void testSingleStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("singleStatementAtCaret.kt") public void testSingleStatementAtCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt"); doTestWithIfElseSurrounder(fileName); } @TestMetadata("variable.kt") public void testVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt"); doTestWithIfElseSurrounder(fileName); } } @@ -322,48 +322,48 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Not extends AbstractSurroundWithTest { public void testAllFilesPresentInNot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("booleanExpr.kt") public void testBooleanExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("booleanExprAtCaret.kt") public void testBooleanExprAtCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("expressionInIf.kt") public void testExpressionInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("notExpression.kt") public void testNotExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("severalExpr.kt") public void testSeveralExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("severalExprAtCaret.kt") public void testSeveralExprAtCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt"); doTestWithNotSurrounder(fileName); } @TestMetadata("variable.kt") public void testVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt"); doTestWithNotSurrounder(fileName); } } @@ -373,24 +373,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parentheses extends AbstractSurroundWithTest { public void testAllFilesPresentInParentheses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("expr.kt") public void testExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("inIf.kt") public void testInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("partOfExpr.kt") public void testPartOfExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt"); doTestWithParenthesesSurrounder(fileName); } @@ -399,60 +399,60 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class NotApplicable extends AbstractSurroundWithTest { public void testAllFilesPresentInNotApplicable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("import.kt") public void testImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("importQualifiedFirst.kt") public void testImportQualifiedFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("importQualifiedSecond.kt") public void testImportQualifiedSecond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("packageName.kt") public void testPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("parameterName.kt") public void testParameterName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("parameterWithType.kt") public void testParameterWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("qualifiedExpressionSecond.kt") public void testQualifiedExpressionSecond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt"); doTestWithParenthesesSurrounder(fileName); } @TestMetadata("qualifiedExpressionSecondWithBracket.kt") public void testQualifiedExpressionSecondWithBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt"); doTestWithParenthesesSurrounder(fileName); } } @@ -463,30 +463,30 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class StringTemplate extends AbstractSurroundWithTest { public void testAllFilesPresentInStringTemplate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("multiExpression.kt") public void testMultiExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt"); doTestWithStringTemplateSurrounder(fileName); } @TestMetadata("multiExpressionConstant.kt") public void testMultiExpressionConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt"); doTestWithStringTemplateSurrounder(fileName); } @TestMetadata("singleConstant.kt") public void testSingleConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt"); doTestWithStringTemplateSurrounder(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt"); doTestWithStringTemplateSurrounder(fileName); } } @@ -496,24 +496,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractSurroundWithTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt"); doTestWithWhenSurrounder(fileName); } @TestMetadata("multiExpression.kt") public void testMultiExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt"); doTestWithWhenSurrounder(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt"); doTestWithWhenSurrounder(fileName); } } @@ -523,24 +523,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class TryCatch extends AbstractSurroundWithTest { public void testAllFilesPresentInTryCatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("moveDeclarationsOut.kt") public void testMoveDeclarationsOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt"); doTestWithTryCatchSurrounder(fileName); } @TestMetadata("multiExpression.kt") public void testMultiExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt"); doTestWithTryCatchSurrounder(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt"); doTestWithTryCatchSurrounder(fileName); } } @@ -550,18 +550,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractSurroundWithTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("multiExpression.kt") public void testMultiExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt"); doTestWithTryCatchFinallySurrounder(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt"); doTestWithTryCatchFinallySurrounder(fileName); } } @@ -571,18 +571,18 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractSurroundWithTest { public void testAllFilesPresentInTryFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("multiExpression.kt") public void testMultiExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt"); doTestWithTryFinallySurrounder(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt"); doTestWithTryFinallySurrounder(fileName); } } @@ -592,24 +592,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiteral extends AbstractSurroundWithTest { public void testAllFilesPresentInFunctionLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("moveDeclarationsOut.kt") public void testMoveDeclarationsOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt"); doTestWithFunctionLiteralSurrounder(fileName); } @TestMetadata("multiStatement.kt") public void testMultiStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt"); doTestWithFunctionLiteralSurrounder(fileName); } @TestMetadata("singleStatement.kt") public void testSingleStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt"); doTestWithFunctionLiteralSurrounder(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java index f507f3ee402..57219aba25a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight.unwrap; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,36 +34,36 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExpression extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ifInBlock.kt") public void testIfInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt"); doTestExpressionRemover(fileName); } @TestMetadata("ifInExpressionInReturn.kt") public void testIfInExpressionInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt"); doTestExpressionRemover(fileName); } @TestMetadata("ifInReturn.kt") public void testIfInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt"); doTestExpressionRemover(fileName); } @TestMetadata("tryInBlock.kt") public void testTryInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt"); doTestExpressionRemover(fileName); } @TestMetadata("tryInReturn.kt") public void testTryInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt"); doTestExpressionRemover(fileName); } } @@ -73,24 +73,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapThen extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapThen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("thenCompoundInBlock.kt") public void testThenCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt"); doTestThenUnwrapper(fileName); } @TestMetadata("thenCompoundInReturn.kt") public void testThenCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt"); doTestThenUnwrapper(fileName); } @TestMetadata("thenSimpleInReturn.kt") public void testThenSimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt"); doTestThenUnwrapper(fileName); } } @@ -100,24 +100,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapElse extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapElse() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("elseCompoundInBlock.kt") public void testElseCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt"); doTestElseUnwrapper(fileName); } @TestMetadata("elseCompoundInReturn.kt") public void testElseCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt"); doTestElseUnwrapper(fileName); } @TestMetadata("elseSimpleInReturn.kt") public void testElseSimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt"); doTestElseUnwrapper(fileName); } } @@ -127,12 +127,12 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveElse extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveElse() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("else.kt") public void testElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt"); doTestElseRemover(fileName); } } @@ -142,24 +142,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapLoop extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapLoop() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt"); doTestLoopUnwrapper(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt"); doTestLoopUnwrapper(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt"); doTestLoopUnwrapper(fileName); } } @@ -169,24 +169,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapTry extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapTry() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("tryCompoundInBlock.kt") public void testTryCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt"); doTestTryUnwrapper(fileName); } @TestMetadata("tryCompoundInReturn.kt") public void testTryCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt"); doTestTryUnwrapper(fileName); } @TestMetadata("trySimpleInReturn.kt") public void testTrySimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt"); doTestTryUnwrapper(fileName); } } @@ -196,24 +196,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapCatch extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapCatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("catchCompoundInBlock.kt") public void testCatchCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt"); doTestCatchUnwrapper(fileName); } @TestMetadata("catchCompoundInReturn.kt") public void testCatchCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt"); doTestCatchUnwrapper(fileName); } @TestMetadata("catchSimpleInReturn.kt") public void testCatchSimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt"); doTestCatchUnwrapper(fileName); } } @@ -223,12 +223,12 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveCatch extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveCatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("catch.kt") public void testCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt"); doTestCatchRemover(fileName); } } @@ -238,24 +238,24 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapFinally extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finallyCompoundInBlock.kt") public void testFinallyCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt"); doTestFinallyUnwrapper(fileName); } @TestMetadata("finallyCompoundInReturn.kt") public void testFinallyCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt"); doTestFinallyUnwrapper(fileName); } @TestMetadata("finallySimpleInReturn.kt") public void testFinallySimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt"); doTestFinallyUnwrapper(fileName); } } @@ -265,18 +265,18 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveFinally extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveFinally() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finallyInBlock.kt") public void testFinallyInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt"); doTestFinallyRemover(fileName); } @TestMetadata("finallyInReturn.kt") public void testFinallyInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt"); doTestFinallyRemover(fileName); } } @@ -286,66 +286,66 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnwrapLambda extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("lambdaCallCompoundInBlock.kt") public void testLambdaCallCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaCallCompoundInReturn.kt") public void testLambdaCallCompoundInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaCallInBlock.kt") public void testLambdaCallInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaCallInBlock2.kt") public void testLambdaCallInBlock2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaCallSimpleInReturn.kt") public void testLambdaCallSimpleInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaInBlock.kt") public void testLambdaInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaNonLocalPropertyCompoundInBlock.kt") public void testLambdaNonLocalPropertyCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaNonLocalPropertyInBlock.kt") public void testLambdaNonLocalPropertyInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaPropertyCompoundInBlock.kt") public void testLambdaPropertyCompoundInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt"); doTestLambdaUnwrapper(fileName); } @TestMetadata("lambdaPropertyInBlock.kt") public void testLambdaPropertyInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt"); doTestLambdaUnwrapper(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java index 756302ca843..5feb45d4845 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java @@ -20,7 +20,7 @@ import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.model.MavenConstants; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import java.io.File; @@ -59,7 +59,7 @@ public abstract class AbstractConfigureProjectByChangingFileTest extends LightCo ((KotlinMavenConfigurator) configurator).changePomFile(getModule(), getFile(), version); } - JetTestUtils.assertEqualsToFile(new File(afterFile), getFile().getText().replace(version, "$VERSION$")); + KotlinTestUtils.assertEqualsToFile(new File(afterFile), getFile().getText().replace(version, "$VERSION$")); } @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java index d5918abad40..65f61881be2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,72 +34,72 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @RunWith(JUnit3RunnerWithInners.class) public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInAndroid_gradle() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); } @TestMetadata("androidStudioDefault_before.gradle") public void testAndroidStudioDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("androidStudioDefaultShapshot_before.gradle") public void testAndroidStudioDefaultShapshot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("buildConfigs_before.gradle") public void testBuildConfigs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("emptyDependencyList_before.gradle") public void testEmptyDependencyList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("emptyFile_before.gradle") public void testEmptyFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("helloWorld_before.gradle") public void testHelloWorld() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("libraryFile_before.gradle") public void testLibraryFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("missedApplyAndroidStatement_before.gradle") public void testMissedApplyAndroidStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("missedBuildscriptBlock_before.gradle") public void testMissedBuildscriptBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("missedRepositoriesInBuildscriptBlock_before.gradle") public void testMissedRepositoriesInBuildscriptBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("productFlavor_before.gradle") public void testProductFlavor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle"); doTestAndroidGradle(fileName); } @@ -108,60 +108,60 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @RunWith(JUnit3RunnerWithInners.class) public static class GradleExamples extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInGradleExamples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true); } @TestMetadata("gradleExample0_before.gradle") public void testGradleExample0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample18_before.gradle") public void testGradleExample18() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample22_before.gradle") public void testGradleExample22() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample44_before.gradle") public void testGradleExample44() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample5_before.gradle") public void testGradleExample5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample50_before.gradle") public void testGradleExample50() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample58_before.gradle") public void testGradleExample58() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample65_before.gradle") public void testGradleExample65() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle"); doTestAndroidGradle(fileName); } @TestMetadata("gradleExample8_before.gradle") public void testGradleExample8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle"); doTestAndroidGradle(fileName); } } @@ -172,18 +172,18 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @RunWith(JUnit3RunnerWithInners.class) public static class Gradle extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInGradle() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); } @TestMetadata("default_before.gradle") public void testDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle"); doTestGradle(fileName); } @TestMetadata("missedLibrary_before.gradle") public void testMissedLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle"); doTestGradle(fileName); } } @@ -193,30 +193,30 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @RunWith(JUnit3RunnerWithInners.class) public static class Maven extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInMaven() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("libraryMissed") public void testLibraryMissed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/"); doTestWithMaven(fileName); } @TestMetadata("pluginMissed") public void testPluginMissed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/"); doTestWithMaven(fileName); } @TestMetadata("simpleProject") public void testSimpleProject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/"); doTestWithMaven(fileName); } @TestMetadata("simpleProjectSnapshot") public void testSimpleProjectSnapshot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/"); doTestWithMaven(fileName); } } @@ -226,30 +226,30 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @RunWith(JUnit3RunnerWithInners.class) public static class Js_maven extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInJs_maven() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/js-maven"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/js-maven"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("libraryMissed") public void testLibraryMissed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/libraryMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/libraryMissed/"); doTestWithJSMaven(fileName); } @TestMetadata("pluginMissed") public void testPluginMissed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/pluginMissed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/pluginMissed/"); doTestWithJSMaven(fileName); } @TestMetadata("simpleProject") public void testSimpleProject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProject/"); doTestWithJSMaven(fileName); } @TestMetadata("simpleProjectSnapshot") public void testSimpleProjectSnapshot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProjectSnapshot/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/configuration/js-maven/simpleProjectSnapshot/"); doTestWithJSMaven(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt index 24c0a855e19..f4d446e8d08 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea.conversion.copy import com.intellij.openapi.actionSystem.IdeActions import org.jetbrains.kotlin.idea.AbstractCopyPasteTest -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import kotlin.test.assertEquals @@ -33,7 +33,7 @@ public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopy override fun getTestDataPath() = BASE_PATH - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE override fun setUp() { super.setUp() @@ -69,6 +69,6 @@ public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopy assertEquals(noConversionExpected, !ConvertJavaCopyPastePostProcessor.conversionPerformed, if (noConversionExpected) "Conversion to Kotlin should not be suggested" else "No conversion to Kotlin suggested") - JetTestUtils.assertEqualsToFile(File(path.replace(".java", ".expected.kt")), myFixture.getFile().getText()) + KotlinTestUtils.assertEqualsToFile(File(path.replace(".java", ".expected.kt")), myFixture.getFile().getText()) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java index a27bf3787c6..5e8c5727577 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.conversion.copy; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,221 +33,221 @@ import java.util.regex.Pattern; public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest { @TestMetadata("AddImports.java") public void testAddImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImports.java"); doTest(fileName); } @TestMetadata("AddImportsButNoConversion.java") public void testAddImportsButNoConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion.java"); doTest(fileName); } @TestMetadata("AddImportsButNoConversion2.java") public void testAddImportsButNoConversion2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsButNoConversion2.java"); doTest(fileName); } @TestMetadata("AddImportsClassInSamePackage.java") public void testAddImportsClassInSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsClassInSamePackage.java"); doTest(fileName); } @TestMetadata("AddImportsDummyConflict.java") public void testAddImportsDummyConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsDummyConflict.java"); doTest(fileName); } @TestMetadata("AddImportsWithExplicitImports.java") public void testAddImportsWithExplicitImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.java"); doTest(fileName); } @TestMetadata("AddKClassImport.java") public void testAddKClassImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddKClassImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/AddKClassImport.java"); doTest(fileName); } public void testAllFilesPresentInConversion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^([^\\.]+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^([^\\.]+)\\.java$"), true); } @TestMetadata("Arithmetic.java") public void testArithmetic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java"); doTest(fileName); } @TestMetadata("ClassWithNoDocComment.java") public void testClassWithNoDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithNoDocComment.java"); doTest(fileName); } @TestMetadata("ClassWithOverrides.java") public void testClassWithOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithOverrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ClassWithOverrides.java"); doTest(fileName); } @TestMetadata("Constructor.java") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java"); doTest(fileName); } @TestMetadata("ConversionInCorrectContext.java") public void testConversionInCorrectContext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ConversionInCorrectContext.java"); doTest(fileName); } @TestMetadata("CopyAnnotation.java") public void testCopyAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/CopyAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/CopyAnnotation.java"); doTest(fileName); } @TestMetadata("ExtendsTypeRef.java") public void testExtendsTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java"); doTest(fileName); } @TestMetadata("FieldWithNoEndComment.java") public void testFieldWithNoEndComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java"); doTest(fileName); } @TestMetadata("FieldWithNoModifierAndNoSemicolon.java") public void testFieldWithNoModifierAndNoSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoModifierAndNoSemicolon.java"); doTest(fileName); } @TestMetadata("FileWithNoPackageStatement.java") public void testFileWithNoPackageStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FileWithNoPackageStatement.java"); doTest(fileName); } @TestMetadata("HalfTheWhiteSpace.java") public void testHalfTheWhiteSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java"); doTest(fileName); } @TestMetadata("ImplementsTypeRef.java") public void testImplementsTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java"); doTest(fileName); } @TestMetadata("Imports1.java") public void testImports1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java"); doTest(fileName); } @TestMetadata("Imports2.java") public void testImports2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java"); doTest(fileName); } @TestMetadata("Imports3.java") public void testImports3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java"); doTest(fileName); } @TestMetadata("Indentation.java") public void testIndentation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java"); doTest(fileName); } @TestMetadata("MethodDeclarationWithNoBody.java") public void testMethodDeclarationWithNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.java"); doTest(fileName); } @TestMetadata("MethodReferenceWithoutQualifier.java") public void testMethodReferenceWithoutQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java"); doTest(fileName); } @TestMetadata("MethodWithNoAnnotation.java") public void testMethodWithNoAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithNoAnnotation.java"); doTest(fileName); } @TestMetadata("MethodWithOnlyOneAnnotation.java") public void testMethodWithOnlyOneAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodWithOnlyOneAnnotation.java"); doTest(fileName); } @TestMetadata("OnlyClosingBrace.java") public void testOnlyClosingBrace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java"); doTest(fileName); } @TestMetadata("OnlyOneBraceFromBlock.java") public void testOnlyOneBraceFromBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java"); doTest(fileName); } @TestMetadata("OnlyQualifier.java") public void testOnlyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java"); doTest(fileName); } @TestMetadata("RawTypeRef.java") public void testRawTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java"); doTest(fileName); } @TestMetadata("RedundantTypeCast.java") public void testRedundantTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java"); doTest(fileName); } @TestMetadata("RedundantTypeCast2.java") public void testRedundantTypeCast2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast2.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast2.java"); doTest(fileName); } @TestMetadata("SampleBlock.java") public void testSampleBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java"); doTest(fileName); } @TestMetadata("SeveralMethodsSample.java") public void testSeveralMethodsSample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java"); doTest(fileName); } @TestMetadata("SingleWordFromIdentifier.java") public void testSingleWordFromIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt index b39e33ff233..47c8c360f18 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt @@ -16,16 +16,16 @@ package org.jetbrains.kotlin.idea.coverage -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.util.application.runWriteAction -public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractKotlinCoverageOutputFilesTest(): KotlinLightCodeInsightFixtureTestCase() { private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/coverage/outputFiles" override fun getTestDataPath(): String? = TEST_DATA_PATH @@ -41,7 +41,7 @@ public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsig } val actualClasses = KotlinCoverageExtension.collectGeneratedClassQualifiedNames(outDir, kotlinFile) - JetTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.join("\n")) + KotlinTestUtils.assertEqualsToFile(File(path.replace(".kt", ".expected.txt")), actualClasses!!.join("\n")) } finally { runWriteAction { diff --git a/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java index 95c484348f7..4dc076d7f4b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.coverage; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KotlinCoverageOutputFilesTestGenerated extends AbstractKotlinCoverageOutputFilesTest { public void testAllFilesPresentInOutputFiles() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/coverage/outputFiles"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/coverage/outputFiles"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotInlinedLambda.kt") public void testNotInlinedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/coverage/outputFiles/NotInlinedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/coverage/outputFiles/NotInlinedLambda.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java index 6f44202ca6b..72da729f128 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.utils.CollectionsKt; @@ -57,7 +57,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -public abstract class AbstractPositionManagerTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractPositionManagerTest extends KotlinLightCodeInsightFixtureTestCase { // Breakpoint is given as a line comment on a specific line, containing the regexp to match the name of the class where that line // can be found. This pattern matches against these line comments and saves the class name in the first group private static final Pattern BREAKPOINT_PATTERN = Pattern.compile("^.*//\\s*(.+)\\s*$"); @@ -79,7 +79,7 @@ public abstract class AbstractPositionManagerTest extends JetLightCodeInsightFix @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt index 3ca75ffa52c..44776d1217e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt @@ -25,12 +25,12 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.debugger.stepping.KotlinLambdaSmartStepTarget import org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils -public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractSmartStepIntoTest : KotlinLightCodeInsightFixtureTestCase() { private val fixture: JavaCodeInsightTestFixture get() = myFixture @@ -81,5 +81,5 @@ public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTest return PluginTestCaseBase.getTestDataPathBase() + "/debugger/smartStepInto" } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index bc6b547229e..42a08018848 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpoint import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinFieldBreakpointType import org.jetbrains.kotlin.idea.debugger.breakpoints.KotlinLineBreakpointType import org.jetbrains.kotlin.idea.debugger.stepping.* -import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext @@ -251,7 +251,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() { val libraryEntry = LibraryUtil.findLibraryEntry(virtualFile, getProject()) if (libraryEntry != null && (libraryEntry is JdkOrderEntry || - libraryEntry.getPresentableName() == JetJdkAndLibraryProjectDescriptor.LIBRARY_NAME)) { + libraryEntry.getPresentableName() == KotlinJdkAndLibraryProjectDescriptor.LIBRARY_NAME)) { return FileUtil.getNameWithoutExtension(virtualFile.getName()) + ".!EXT!" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index 1a1203be83d..4d0635f76d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.MockLibraryUtil; import org.junit.ComparisonFailure; @@ -78,7 +78,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { @Override protected void setUp() throws Exception { - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); super.setUp(); } @@ -96,7 +96,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { @Override protected void tearDown() throws Exception { super.tearDown(); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); } @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod") @@ -118,7 +118,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { List options = Arrays.asList("-d", outputDir, "-classpath", ForTestCompileRuntime.runtimeJarForTests().getPath()); try { - JetTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options); + KotlinTestUtils.compileJavaFiles(findJavaFiles(new File(sourcesDir)), options); } catch (IOException e) { throw new RuntimeException(e); @@ -236,7 +236,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { super.checkTestOutput(); } catch (ComparisonFailure e) { - JetTestUtils.assertEqualsToFile( + KotlinTestUtils.assertEqualsToFile( new File(getTestAppPath() + File.separator + "outs" + File.separator + getTestName(true) + ".out"), e.getActual()); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java index 9c81b3cb8c8..2ccc17312a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,84 +34,84 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class StepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepInto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectFunFromClass.kt") public void testClassObjectFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("classObjectFunFromTopLevel.kt") public void testClassObjectFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("extFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); doStepIntoTest(fileName); } @TestMetadata("javaFun.kt") public void testJavaFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); doStepIntoTest(fileName); } @TestMetadata("memberFunFromClass.kt") public void testMemberFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("memberFunFromTopLevel.kt") public void testMemberFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("memberGetterFromClass.kt") public void testMemberGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("memberGetterFromTopLevel.kt") public void testMemberGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("objectFun.kt") public void testObjectFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelFunFromClass.kt") public void testTopLevelFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelFunFromTopLevel.kt") public void testTopLevelFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromClass.kt") public void testTopLevelGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); doStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromTopLevel.kt") public void testTopLevelGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); doStepIntoTest(fileName); } } @@ -121,84 +121,84 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class SmartStepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInSmartStepInto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectFunFromClass.kt") public void testClassObjectFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("classObjectFunFromTopLevel.kt") public void testClassObjectFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/classObjectFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("extFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/extFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("javaFun.kt") public void testJavaFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/javaFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberFunFromClass.kt") public void testMemberFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberFunFromTopLevel.kt") public void testMemberFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberGetterFromClass.kt") public void testMemberGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("memberGetterFromTopLevel.kt") public void testMemberGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/memberGetterFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("objectFun.kt") public void testObjectFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/objectFun.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelFunFromClass.kt") public void testTopLevelFunFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelFunFromTopLevel.kt") public void testTopLevelFunFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelFunFromTopLevel.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromClass.kt") public void testTopLevelGetterFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromClass.kt"); doSmartStepIntoTest(fileName); } @TestMetadata("topLevelGetterFromTopLevel.kt") public void testTopLevelGetterFromTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepIntoAndSmartStepInto/topLevelGetterFromTopLevel.kt"); doSmartStepIntoTest(fileName); } } @@ -209,71 +209,71 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { public static class StepIntoOnly extends AbstractKotlinSteppingTest { @TestMetadata("accessors.kt") public void testAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt"); doStepIntoTest(fileName); } public void testAllFilesPresentInStepIntoOnly() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("continueLabel.kt") public void testContinueLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/continueLabel.kt"); doStepIntoTest(fileName); } @TestMetadata("defaultAccessors.kt") public void testDefaultAccessors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/defaultAccessors.kt"); doStepIntoTest(fileName); } @TestMetadata("forLoop.kt") public void testForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/forLoop.kt"); doStepIntoTest(fileName); } @TestMetadata("returnVoid.kt") public void testReturnVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/returnVoid.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoFromInlineFun.kt") public void testStepIntoFromInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoFromInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoInlineFun.kt") public void testStepIntoInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdLibInlineFun.kt") public void testStepIntoStdLibInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/stepIntoStdLibInlineFun.kt"); doStepIntoTest(fileName); } @TestMetadata("syntheticMethods.kt") public void testSyntheticMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/syntheticMethods.kt"); doStepIntoTest(fileName); } @TestMetadata("traits.kt") public void testTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/traits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/traits.kt"); doStepIntoTest(fileName); } @TestMetadata("whenExpr.kt") public void testWhenExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepInto/whenExpr.kt"); doStepIntoTest(fileName); } } @@ -283,48 +283,48 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class StepOut extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepOut() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOut"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOut"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fwBackingField.kt") public void testFwBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/fwBackingField.kt"); doStepOutTest(fileName); } @TestMetadata("inapplicableFieldWatchpoints.kt") public void testInapplicableFieldWatchpoints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/inapplicableFieldWatchpoints.kt"); doStepOutTest(fileName); } @TestMetadata("stepOutInlineFunction.kt") public void testStepOutInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlineFunction.kt"); doStepOutTest(fileName); } @TestMetadata("stepOutInlinedLambdaArgument.kt") public void testStepOutInlinedLambdaArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutInlinedLambdaArgument.kt"); doStepOutTest(fileName); } @TestMetadata("stepOutSeveralInlineArgumentDeepest.kt") public void testStepOutSeveralInlineArgumentDeepest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineArgumentDeepest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineArgumentDeepest.kt"); doStepOutTest(fileName); } @TestMetadata("stepOutSeveralInlineFunctions.kt") public void testStepOutSeveralInlineFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctions.kt"); doStepOutTest(fileName); } @TestMetadata("stepOutSeveralInlineFunctionsDeepest.kt") public void testStepOutSeveralInlineFunctionsDeepest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctionsDeepest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOut/stepOutSeveralInlineFunctionsDeepest.kt"); doStepOutTest(fileName); } } @@ -334,84 +334,84 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class StepOver extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepOver() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOver"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/stepOver"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ifCapturedVariableKt9118.kt") public void testIfCapturedVariableKt9118() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/ifCapturedVariableKt9118.kt"); doStepOverTest(fileName); } @TestMetadata("inlineFunctionSameLines.kt") public void testInlineFunctionSameLines() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineFunctionSameLines.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/inlineFunctionSameLines.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverForWithInline.kt") public void testStepOverForWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverForWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverForWithInline.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverIfWithInline.kt") public void testStepOverIfWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverIfWithInline.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverInlineFunctionInReturn.kt") public void testStepOverInlineFunctionInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlineFunctionInReturn.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverInlinedLambda.kt") public void testStepOverInlinedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambda.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverInlinedLambdaStdlib.kt") public void testStepOverInlinedLambdaStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambdaStdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverInlinedLambdaStdlib.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverReifiedParam.kt") public void testStepOverReifiedParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverReifiedParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverReifiedParam.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverSimpleFun.kt") public void testStepOverSimpleFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverSimpleFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverSimpleFun.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverTryCatchWithInline.kt") public void testStepOverTryCatchWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverTryCatchWithInline.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverWhenInReturn.kt") public void testStepOverWhenInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenInReturn.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverWhenWithInline.kt") public void testStepOverWhenWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhenWithInline.kt"); doStepOverTest(fileName); } @TestMetadata("stepOverWhileWithInline.kt") public void testStepOverWhileWithInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/stepOver/stepOverWhileWithInline.kt"); doStepOverTest(fileName); } } @@ -421,78 +421,78 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class Filters extends AbstractKotlinSteppingTest { public void testAllFilesPresentInFilters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/filters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/filters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("checkNotNull.kt") public void testCheckNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/checkNotNull.kt"); doStepIntoTest(fileName); } @TestMetadata("doNotSkipClassloader.kt") public void testDoNotSkipClassloader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipClassloader.kt"); doStepIntoTest(fileName); } @TestMetadata("doNotSkipConstructors.kt") public void testDoNotSkipConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/doNotSkipConstructors.kt"); doStepIntoTest(fileName); } @TestMetadata("npe.kt") public void testNpe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/npe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/npe.kt"); doStepIntoTest(fileName); } @TestMetadata("reflectKClass.kt") public void testReflectKClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/reflectKClass.kt"); doStepIntoTest(fileName); } @TestMetadata("skipClassloader.kt") public void testSkipClassloader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipClassloader.kt"); doStepIntoTest(fileName); } @TestMetadata("skipConstructors.kt") public void testSkipConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/skipConstructors.kt"); doStepIntoTest(fileName); } @TestMetadata("stdlibStep.kt") public void testStdlibStep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stdlibStep.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoMultiFileFacade.kt") public void testStepIntoMultiFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoMultiFileFacade.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoMultiFileFacade.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoSpecificKotlinClasses.kt") public void testStepIntoSpecificKotlinClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoSpecificKotlinClasses.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdlib.kt") public void testStepIntoStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlib.kt"); doStepIntoTest(fileName); } @TestMetadata("stepIntoStdlibFacadeClass.kt") public void testStepIntoStdlibFacadeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/filters/stepIntoStdlibFacadeClass.kt"); doStepIntoTest(fileName); } } @@ -502,72 +502,72 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @RunWith(JUnit3RunnerWithInners.class) public static class Custom extends AbstractKotlinSteppingTest { public void testAllFilesPresentInCustom() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/custom"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepping/custom"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funLiteral.kt") public void testFunLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/funLiteral.kt"); doCustomTest(fileName); } @TestMetadata("fwAbstractProperty.kt") public void testFwAbstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwAbstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwAbstractProperty.kt"); doCustomTest(fileName); } @TestMetadata("fwInitializer.kt") public void testFwInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwInitializer.kt"); doCustomTest(fileName); } @TestMetadata("fwPropertyInInterface.kt") public void testFwPropertyInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwPropertyInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/fwPropertyInInterface.kt"); doCustomTest(fileName); } @TestMetadata("severalFunLiterals.kt") public void testSeveralFunLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiterals.kt"); doCustomTest(fileName); } @TestMetadata("severalFunLiteralsInClass.kt") public void testSeveralFunLiteralsInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/severalFunLiteralsInClass.kt"); doCustomTest(fileName); } @TestMetadata("simpleConditionalBreakpoint.kt") public void testSimpleConditionalBreakpoint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/simpleConditionalBreakpoint.kt"); doCustomTest(fileName); } @TestMetadata("smartStepIntoInlinedFunLiteral.kt") public void testSmartStepIntoInlinedFunLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunLiteral.kt"); doCustomTest(fileName); } @TestMetadata("smartStepIntoInlinedFunctionalExpression.kt") public void testSmartStepIntoInlinedFunctionalExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/smartStepIntoInlinedFunctionalExpression.kt"); doCustomTest(fileName); } @TestMetadata("stepIntoStdlibInlineFun2step.kt") public void testStepIntoStdlibInlineFun2step() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepIntoStdlibInlineFun2step.kt"); doCustomTest(fileName); } @TestMetadata("stepOutInlineFunctionStdlib.kt") public void testStepOutInlineFunctionStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepping/custom/stepOutInlineFunctionStdlib.kt"); doCustomTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/PositionManagerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/PositionManagerTestGenerated.java index 81f3c9f4f13..74daeafa6ff 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/PositionManagerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/PositionManagerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,132 +28,132 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetPositionManagerTestGenerated extends AbstractJetPositionManagerTest { +public class PositionManagerTestGenerated extends AbstractPositionManagerTest { @TestMetadata("idea/testData/debugger/positionManager") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class SingleFile extends AbstractJetPositionManagerTest { + public static class SingleFile extends AbstractPositionManagerTest { public void testAllFilesPresentInSingleFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("anonymousFunction.kt") public void testAnonymousFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousFunction.kt"); doTest(fileName); } @TestMetadata("anonymousNamedFunction.kt") public void testAnonymousNamedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousNamedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/anonymousNamedFunction.kt"); doTest(fileName); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/classObject.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/enum.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteral.kt"); doTest(fileName); } @TestMetadata("functionLiteralInVal.kt") public void testFunctionLiteralInVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteralInVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/functionLiteralInVal.kt"); doTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/innerClass.kt"); doTest(fileName); } @TestMetadata("JvmNameAnnotation.kt") public void testJvmNameAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/JvmNameAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/JvmNameAnnotation.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/localFunction.kt"); doTest(fileName); } @TestMetadata("objectDeclaration.kt") public void testObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectDeclaration.kt"); doTest(fileName); } @TestMetadata("objectExpression.kt") public void testObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/objectExpression.kt"); doTest(fileName); } @TestMetadata("package.kt") public void testPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/package.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/package.kt"); doTest(fileName); } @TestMetadata("propertyAccessor.kt") public void testPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyAccessor.kt"); doTest(fileName); } @TestMetadata("propertyInitializer.kt") public void testPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/propertyInitializer.kt"); doTest(fileName); } @TestMetadata("topLevelPropertyInitializer.kt") public void testTopLevelPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/topLevelPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/trait.kt"); doTest(fileName); } @TestMetadata("twoClasses.kt") public void testTwoClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/twoClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/twoClasses.kt"); doTest(fileName); } @TestMetadata("_DefaultPackage.kt") public void test_DefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/_DefaultPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/_DefaultPackage.kt"); doTest(fileName); } } @@ -161,20 +161,20 @@ public class JetPositionManagerTestGenerated extends AbstractJetPositionManagerT @TestMetadata("idea/testData/debugger/positionManager") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class MultiFile extends AbstractJetPositionManagerTest { + public static class MultiFile extends AbstractPositionManagerTest { public void testAllFilesPresentInMultiFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/positionManager"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("multiFilePackage") public void testMultiFilePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFilePackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFilePackage/"); doTest(fileName); } @TestMetadata("multiFileSameName") public void testMultiFileSameName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFileSameName/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/positionManager/multiFileSameName/"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java index 16f649365ed..2cc9da56eec 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,186 +32,186 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest { public void testAllFilesPresentInSmartStepInto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/annotation.kt"); doTest(fileName); } @TestMetadata("arrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/arrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/arrayAccess.kt"); doTest(fileName); } @TestMetadata("callChain.kt") public void testCallChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/callChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/callChain.kt"); doTest(fileName); } @TestMetadata("conventionMethod.kt") public void testConventionMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/conventionMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/conventionMethod.kt"); doTest(fileName); } @TestMetadata("delegatedPropertyGetter.kt") public void testDelegatedPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/doWhile.kt"); doTest(fileName); } @TestMetadata("dotQualified.kt") public void testDotQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualified.kt"); doTest(fileName); } @TestMetadata("dotQualifiedInParam.kt") public void testDotQualifiedInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt"); doTest(fileName); } @TestMetadata("empty.kt") public void testEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/empty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/empty.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/for.kt"); doTest(fileName); } @TestMetadata("funLiteral.kt") public void testFunLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funLiteral.kt"); doTest(fileName); } @TestMetadata("funWithExpressionBody.kt") public void testFunWithExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funWithExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funWithExpressionBody.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/if.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/infixCall.kt"); doTest(fileName); } @TestMetadata("inlinedFunLiteral.kt") public void testInlinedFunLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunLiteral.kt"); doTest(fileName); } @TestMetadata("inlinedFunctionalExpression.kt") public void testInlinedFunctionalExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunctionalExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/inlinedFunctionalExpression.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt"); doTest(fileName); } @TestMetadata("libraryFun.kt") public void testLibraryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/libraryFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/libraryFun.kt"); doTest(fileName); } @TestMetadata("multiline.kt") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multiline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multiline.kt"); doTest(fileName); } @TestMetadata("multilineCallChain.kt") public void testMultilineCallChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multilineCallChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multilineCallChain.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/object.kt"); doTest(fileName); } @TestMetadata("param.kt") public void testParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/param.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/param.kt"); doTest(fileName); } @TestMetadata("parantesized.kt") public void testParantesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/parantesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/parantesized.kt"); doTest(fileName); } @TestMetadata("propertyGetter.kt") public void testPropertyGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/propertyGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/propertyGetter.kt"); doTest(fileName); } @TestMetadata("renderer.kt") public void testRenderer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/renderer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/renderer.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/simple.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/stringTemplate.kt"); doTest(fileName); } @TestMetadata("unary.kt") public void testUnary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/unary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/unary.kt"); doTest(fileName); } @TestMetadata("when.kt") public void testWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/when.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/when.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/while.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 0acc5e3e021..27c766e44cd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -22,25 +22,25 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest +import org.jetbrains.kotlin.checkers.AbstractPsiCheckerTest import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractCompletionHandlerTest -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import kotlin.test.assertNull import kotlin.test.assertTrue -public abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() { +public abstract class AbstractCodeFragmentHighlightingTest : AbstractPsiCheckerTest() { override fun doTest(filePath: String) { myFixture.configureByCodeFragment(filePath) myFixture.checkHighlighting(true, false, false) @@ -82,7 +82,7 @@ public abstract class AbstractCodeFragmentCompletionHandlerTest : AbstractComple } } -public abstract class AbstractCodeFragmentAutoImportTest : AbstractJetPsiCheckerTest() { +public abstract class AbstractCodeFragmentAutoImportTest : AbstractPsiCheckerTest() { override fun doTest(filePath: String) { myFixture.configureByCodeFragment(filePath) myFixture.doHighlighting() @@ -100,8 +100,8 @@ public abstract class AbstractCodeFragmentAutoImportTest : AbstractJetPsiChecker assertNull(fixAfter, "No import fix should be available after") } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() } private fun KtCodeFragment.checkImports(testPath: String) { @@ -110,7 +110,7 @@ private fun KtCodeFragment.checkImports(testPath: String) { val fragmentAfterFile = File(testPath + ".after.imports") if (fragmentAfterFile.exists()) { - JetTestUtils.assertEqualsToFile(fragmentAfterFile, importsText) + KotlinTestUtils.assertEqualsToFile(fragmentAfterFile, importsText) } else { assertTrue(importsText.isEmpty(), "Unexpected imports found: $importsText" ) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentAutoImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentAutoImportTestGenerated.java index 3f2eff5ed21..014dbaacb4c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentAutoImportTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentAutoImportTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CodeFragmentAutoImportTestGenerated extends AbstractCodeFragmentAutoImportTest { public void testAllFilesPresentInCodeFragmentAutoImport() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix.special/codeFragmentAutoImport"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix.special/codeFragmentAutoImport"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("ExtensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix.special/codeFragmentAutoImport/ExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix.special/codeFragmentAutoImport/ExtensionFun.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java index 4191c28ab97..5a1112c8109 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,42 +32,42 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CodeFragmentCompletionHandlerTestGenerated extends AbstractCodeFragmentCompletionHandlerTest { public void testAllFilesPresentInRuntimeCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/runtimeCast"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/runtimeCast"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CastPrivateFun.kt") public void testCastPrivateFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPrivateFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPrivateFun.kt"); doTest(fileName); } @TestMetadata("CastPropertyWithSmartCast.kt") public void testCastPropertyWithSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPropertyWithSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/CastPropertyWithSmartCast.kt"); doTest(fileName); } @TestMetadata("InsertExtFunction.kt") public void testInsertExtFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertExtFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertExtFunction.kt"); doTest(fileName); } @TestMetadata("InsertFunction.kt") public void testInsertFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertFunction.kt"); doTest(fileName); } @TestMetadata("InsertImport.kt") public void testInsertImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/InsertImport.kt"); doTest(fileName); } @TestMetadata("NotImportedExtension.kt") public void testNotImportedExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/NotImportedExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/handlers/runtimeCast/NotImportedExtension.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index 436c8af575b..61f82915521 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -30,10 +30,10 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -private val LIBRARY_SRC_PATH = JetTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" +private val LIBRARY_SRC_PATH = KotlinTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" public class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java index 8ee316fc2d1..7b064bc3e89 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest { public void testAllFilesPresentInCodeFragments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("blockCodeFragment.kt") public void testBlockCodeFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/blockCodeFragment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/blockCodeFragment.kt"); doTest(fileName); } @TestMetadata("classHeader.kt") public void testClassHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/classHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/classHeader.kt"); doTest(fileName); } @TestMetadata("elementAt.kt") public void testElementAt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAt.kt"); doTest(fileName); } @TestMetadata("elementAtFirstInBlock.kt") public void testElementAtFirstInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAtFirstInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/elementAtFirstInBlock.kt"); doTest(fileName); } @TestMetadata("localVal.kt") public void testLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVal.kt"); doTest(fileName); } @TestMetadata("localVariables.kt") public void testLocalVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariables.kt"); doTest(fileName); } @TestMetadata("localVariablesOnReturn.kt") public void testLocalVariablesOnReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariablesOnReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/localVariablesOnReturn.kt"); doTest(fileName); } @TestMetadata("noDuplicatesForSyntheticProperties.kt") public void testNoDuplicatesForSyntheticProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/noDuplicatesForSyntheticProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/noDuplicatesForSyntheticProperties.kt"); doTest(fileName); } @TestMetadata("topLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/topLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/topLevel.kt"); doTest(fileName); } @@ -94,42 +94,42 @@ public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCom @RunWith(JUnit3RunnerWithInners.class) public static class RuntimeType extends AbstractCodeFragmentCompletionTest { public void testAllFilesPresentInRuntimeType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments/runtimeType"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/basic/codeFragments/runtimeType"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("castWithGenerics.kt") public void testCastWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/castWithGenerics.kt"); doTest(fileName); } @TestMetadata("complexHierarchy.kt") public void testComplexHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/complexHierarchy.kt"); doTest(fileName); } @TestMetadata("extensionMethod.kt") public void testExtensionMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/extensionMethod.kt"); doTest(fileName); } @TestMetadata("notImportedExtension.kt") public void testNotImportedExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/notImportedExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/notImportedExtension.kt"); doTest(fileName); } @TestMetadata("runtimeCast.kt") public void testRuntimeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/runtimeCast.kt"); doTest(fileName); } @TestMetadata("smartCompletion.kt") public void testSmartCompletion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/smartCompletion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/codeFragments/runtimeType/smartCompletion.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java index 58dc43a3bcb..94bd1b0d2b2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -35,251 +35,251 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest { @TestMetadata("abstractFunCall.kt") public void testAbstractFunCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt"); doSingleBreakpointTest(fileName); } public void testAllFilesPresentInSingleBreakpoint() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/anonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/anonymousObjects.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("arrays.kt") public void testArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("boxParam.kt") public void testBoxParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/boxParam.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("breakpointInInlineFun.kt") public void testBreakpointInInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/breakpointInInlineFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/breakpointInInlineFun.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("callableBug.kt") public void testCallableBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/callableBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/callableBug.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("classFromAnotherPackage.kt") public void testClassFromAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("classObjectVal.kt") public void testClassObjectVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("collections.kt") public void testCollections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("dependentOnFile.kt") public void testDependentOnFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("doubles.kt") public void testDoubles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("errors.kt") public void testErrors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("extractLocalVariables.kt") public void testExtractLocalVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("extractThis.kt") public void testExtractThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("extractThisInTrait.kt") public void testExtractThisInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThisInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThisInTrait.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("extractVariablesFromCall.kt") public void testExtractVariablesFromCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("funFromSuperClass.kt") public void testFunFromSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/funFromSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/funFromSuperClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/innerClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("insertInBlock.kt") public void testInsertInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("kt5554OnlyIntsShouldBeCoerced.kt") public void testKt5554OnlyIntsShouldBeCoerced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("kt7046localVarInInline.kt") public void testKt7046localVarInInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt7046localVarInInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/kt7046localVarInInline.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("localVariables.kt") public void testLocalVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/localVariables.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("methodWithBreakpoint.kt") public void testMethodWithBreakpoint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/methodWithBreakpoint.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("multilineExpressionAtBreakpoint.kt") public void testMultilineExpressionAtBreakpoint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("onClassHeader.kt") public void testOnClassHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onClassHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onClassHeader.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("onObjectHeader.kt") public void testOnObjectHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onObjectHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/onObjectHeader.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("parametersOfInlineFun.kt") public void testParametersOfInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFun.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("parametersOfInlineFunSeveralOnLine.kt") public void testParametersOfInlineFunSeveralOnLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFunSeveralOnLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/parametersOfInlineFunSeveralOnLine.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("privateMember.kt") public void testPrivateMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("protectedMember.kt") public void testProtectedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("stdlib.kt") public void testStdlib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("typeParameterRef.kt") public void testTypeParameterRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/typeParameterRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/typeParameterRef.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("unboxParam.kt") public void testUnboxParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unboxParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unboxParam.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("unsafeCall.kt") public void testUnsafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/unsafeCall.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("vars.kt") public void testVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt"); doSingleBreakpointTest(fileName); } @TestMetadata(".kt.kt") public void test_kt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt"); doSingleBreakpointTest(fileName); } @@ -288,72 +288,72 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class CompilingEvaluator extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInCompilingEvaluator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ceAnonymousObject.kt") public void testCeAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceAnonymousObjectCapturedInClosure.kt") public void testCeAnonymousObjectCapturedInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectCapturedInClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectCapturedInClosure.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceAnonymousObjectThisAsReceiver.kt") public void testCeAnonymousObjectThisAsReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectThisAsReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceAnonymousObjectThisAsReceiver.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceLambda.kt") public void testCeLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceLocalClass.kt") public void testCeLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceLocalClassMembers.kt") public void testCeLocalClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassMembers.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceLocalClassWithSuperClass.kt") public void testCeLocalClassWithSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassWithSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceLocalClassWithSuperClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceMembers.kt") public void testCeMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceMembers.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceObject.kt") public void testCeObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceSeveralLambdas.kt") public void testCeSeveralLambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ceSuperAccess.kt") public void testCeSuperAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSuperAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/compilingEvaluator/ceSuperAccess.kt"); doSingleBreakpointTest(fileName); } } @@ -363,66 +363,66 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class ExtraVariables extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInExtraVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("evBreakpointOnPropertyDeclaration.kt") public void testEvBreakpointOnPropertyDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evBreakpointOnPropertyDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evBreakpointOnPropertyDeclaration.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evDelegatedProperty.kt") public void testEvDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDelegatedProperty.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evDuplicateItems.kt") public void testEvDuplicateItems() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDuplicateItems.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evDuplicateItems.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evFinalProperty.kt") public void testEvFinalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFinalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evFinalProperty.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evLineRange.kt") public void testEvLineRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evLineRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evLineRange.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evProperty.kt") public void testEvProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evProperty.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evPropertyRefExpr.kt") public void testEvPropertyRefExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evPropertyRefExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evPropertyRefExpr.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evSkipAnonymousObject.kt") public void testEvSkipAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipAnonymousObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evSkipLambda.kt") public void testEvSkipLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("evSkipLocalClass.kt") public void testEvSkipLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extraVariables/evSkipLocalClass.kt"); doSingleBreakpointTest(fileName); } } @@ -432,120 +432,120 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class Frame extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInFrame() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegatedPropertyInClass.kt") public void testDelegatedPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("delegatedPropertyInClassWoRenderer.kt") public void testDelegatedPropertyInClassWoRenderer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameAnonymousObject.kt") public void testFrameAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameClassObject.kt") public void testFrameClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameClosingBracket.kt") public void testFrameClosingBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClosingBracket.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClosingBracket.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameExtFunExtFun.kt") public void testFrameExtFunExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameExtensionFun.kt") public void testFrameExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameInnerClass.kt") public void testFrameInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameInnerLambda.kt") public void testFrameInnerLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameLambda.kt") public void testFrameLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameLambdaNotUsed.kt") public void testFrameLambdaNotUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameLocalVariable.kt") public void testFrameLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLocalVariable.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameObject.kt") public void testFrameObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameSharedVar.kt") public void testFrameSharedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameSharedVarLocalVar.kt") public void testFrameSharedVarLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVarLocalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVarLocalVar.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameSimple.kt") public void testFrameSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameThis0.kt") public void testFrameThis0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameThis0Ext.kt") public void testFrameThis0Ext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("frameThis0This0.kt") public void testFrameThis0This0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt"); doSingleBreakpointTest(fileName); } } @@ -555,30 +555,30 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class Labels extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("lCallOnLabeledObj.kt") public void testLCallOnLabeledObj() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lCallOnLabeledObj.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lCallOnLabeledObj.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("lSeveralLabels.kt") public void testLSeveralLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSeveralLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSeveralLabels.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("lSimple.kt") public void testLSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/lSimple.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("ldifferentTypes.kt") public void testLdifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/ldifferentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/labels/ldifferentTypes.kt"); doSingleBreakpointTest(fileName); } } @@ -588,48 +588,48 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class Lambdas extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInLambdas() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inlineFunctionalExpression.kt") public void testInlineFunctionalExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineFunctionalExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineFunctionalExpression.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("inlineLambda.kt") public void testInlineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/inlineLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("lambdaOnSecondLine.kt") public void testLambdaOnSecondLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnSecondLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/lambdaOnSecondLine.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("oneLineFunctionalExpression.kt") public void testOneLineFunctionalExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineFunctionalExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineFunctionalExpression.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("oneLineLambda.kt") public void testOneLineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/oneLineLambda.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("twoLambdasOnOneLineFirst.kt") public void testTwoLambdasOnOneLineFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineFirst.kt"); doSingleBreakpointTest(fileName); } @TestMetadata("twoLambdasOnOneLineSecond.kt") public void testTwoLambdasOnOneLineSecond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt"); doSingleBreakpointTest(fileName); } } @@ -639,12 +639,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class Renderer extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInRenderer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("toStringRenderer.kt") public void testToStringRenderer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/renderer/toStringRenderer.kt"); doSingleBreakpointTest(fileName); } } @@ -655,78 +655,78 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInMultipleBreakpoints() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("clearCache.kt") public void testClearCache() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("constructors.kt") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/constructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/constructors.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("exceptions.kt") public void testExceptions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("funFromOuterClassInLamdba.kt") public void testFunFromOuterClassInLamdba() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/funFromOuterClassInLamdba.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/funFromOuterClassInLamdba.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("isInsideInlineLambda.kt") public void testIsInsideInlineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/isInsideInlineLambda.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/localFun.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("multipleBreakpointsAtLine.kt") public void testMultipleBreakpointsAtLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/multipleBreakpointsAtLine.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("whenEntry.kt") public void testWhenEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("withoutBodyFunctions.kt") public void testWithoutBodyFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("withoutBodyProperties.kt") public void testWithoutBodyProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("withoutBodyProperties2.kt") public void testWithoutBodyProperties2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties2.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("withoutBodyTypeParameters.kt") public void testWithoutBodyTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.kt"); doMultipleBreakpointsTest(fileName); } @@ -735,18 +735,18 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("customLibClassName.kt") public void testCustomLibClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.kt"); doMultipleBreakpointsTest(fileName); } @TestMetadata("localFunInLibrary.kt") public void testLocalFunInLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/localFunInLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/localFunInLibrary.kt"); doMultipleBreakpointsTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index e6d01bbb410..2b5c70c283c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,174 +34,174 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr @RunWith(JUnit3RunnerWithInners.class) public static class SelectExpression extends AbstractSelectExpressionForDebuggerTest { public void testAllFilesPresentInSelectExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("annotation.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/annotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/annotation.kt"); doTest(fileName); } @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/binaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/binaryExpression.kt"); doTest(fileName); } @TestMetadata("call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/call.kt"); doTest(fileName); } @TestMetadata("expressionInPropertyInitializer.kt") public void testExpressionInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/extensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/extensionFun.kt"); doTest(fileName); } @TestMetadata("funArgument.kt") public void testFunArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/funArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/funArgument.kt"); doTest(fileName); } @TestMetadata("functionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/functionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/functionLiteral.kt"); doTest(fileName); } @TestMetadata("getConvention.kt") public void testGetConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/getConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/getConvention.kt"); doTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/imports.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCall.kt"); doTest(fileName); } @TestMetadata("infixCallArgument.kt") public void testInfixCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCallArgument.kt"); doTest(fileName); } @TestMetadata("isExpression.kt") public void testIsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/isExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/isExpression.kt"); doTest(fileName); } @TestMetadata("keyword.kt") public void testKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/keyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/keyword.kt"); doTest(fileName); } @TestMetadata("modifier.kt") public void testModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/modifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/modifier.kt"); doTest(fileName); } @TestMetadata("package.kt") public void testPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/package.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/package.kt"); doTest(fileName); } @TestMetadata("param.kt") public void testParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/param.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/param.kt"); doTest(fileName); } @TestMetadata("propertyCall.kt") public void testPropertyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyCall.kt"); doTest(fileName); } @TestMetadata("propertyDeclaration.kt") public void testPropertyDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyDeclaration.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressionProperty.kt") public void testQualifiedExpressionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressionReceiver.kt") public void testQualifiedExpressionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt"); doTest(fileName); } @TestMetadata("qualifiedExpressionSelector.kt") public void testQualifiedExpressionSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt"); doTest(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/super.kt"); doTest(fileName); } @TestMetadata("this.kt") public void testThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/this.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/this.kt"); doTest(fileName); } @TestMetadata("thisWithLabel.kt") public void testThisWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/thisWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/thisWithLabel.kt"); doTest(fileName); } @TestMetadata("unaryExpression.kt") public void testUnaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/unaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/unaryExpression.kt"); doTest(fileName); } @TestMetadata("userType.kt") public void testUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userType.kt"); doTest(fileName); } @TestMetadata("userTypeGeneric.kt") public void testUserTypeGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeGeneric.kt"); doTest(fileName); } @TestMetadata("userTypeQualified.kt") public void testUserTypeQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeQualified.kt"); doTest(fileName); } } @@ -211,114 +211,114 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr @RunWith(JUnit3RunnerWithInners.class) public static class DisallowMethodCalls extends AbstractSelectExpressionForDebuggerTest { public void testAllFilesPresentInDisallowMethodCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression/disallowMethodCalls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression/disallowMethodCalls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/binaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/binaryExpression.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/call.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("expressionInPropertyInitializer.kt") public void testExpressionInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/expressionInPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/expressionInPropertyInitializer.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/extensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/extensionFun.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("funArgument.kt") public void testFunArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/funArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/funArgument.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("functionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/functionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/functionLiteral.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("getConvention.kt") public void testGetConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/getConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/getConvention.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCall.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("infixCallArgument.kt") public void testInfixCallArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCallArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/infixCallArgument.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("isExpression.kt") public void testIsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/isExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/isExpression.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("propertyCall.kt") public void testPropertyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/propertyCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/propertyCall.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("qualifiedExpressionProperty.kt") public void testQualifiedExpressionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionProperty.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("qualifiedExpressionReceiver.kt") public void testQualifiedExpressionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionReceiver.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("qualifiedExpressionSelector.kt") public void testQualifiedExpressionSelector() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionSelector.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/qualifiedExpressionSelector.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/super.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("this.kt") public void testThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/this.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/this.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("thisWithLabel.kt") public void testThisWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/thisWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/thisWithLabel.kt"); doTestWoMethodCalls(fileName); } @TestMetadata("unaryExpression.kt") public void testUnaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/unaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/disallowMethodCalls/unaryExpression.kt"); doTestWoMethodCalls(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index ffae3ec46d1..75eafc5e8d1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea.decompiler import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiManager import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.junit.Assert -public abstract class AbstractInternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractInternalCompiledClassesTest : KotlinLightCodeInsightFixtureTestCase() { private fun isFileWithHeader(predicate: (KotlinClassHeader) -> Boolean) : VirtualFile.() -> Boolean = { val header = KotlinBinaryClassCache.getKotlinBinaryClass(this)?.getClassHeader() header != null && predicate(header) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt index 5b051f3585f..94e13b6ac17 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt @@ -25,7 +25,7 @@ import junit.framework.TestCase import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.test.* -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.LinkedHashMap @@ -56,7 +56,7 @@ public abstract class AbstractNavigateToLibrarySourceTest : KotlinCodeInsightTes } override fun getTestDataPath(): String = - JetTestUtils.getHomeDirectory() + File.separator + KotlinTestUtils.getHomeDirectory() + File.separator private fun checkAnnotatedLibraryCode(forceResolve: Boolean) { SourceNavigationHelper.setForceResolve(forceResolve) @@ -104,9 +104,9 @@ public abstract class AbstractNavigateToLibrarySourceTest : KotlinCodeInsightTes private fun getExpectedAnnotatedLibraryCode(): String { val document = getDocument(getFile()) TestCase.assertNotNull(document) - return JetTestUtils.getLastCommentedLines(document) + return KotlinTestUtils.getLastCommentedLines(document) } - private fun getProjectDescriptor(): JetLightProjectDescriptor = + private fun getProjectDescriptor(): KotlinLightProjectDescriptor = JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/library", true) } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java index 6d27258e134..fd3c27b7f15 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -26,7 +26,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.idea.KotlinLanguage; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase { /** @@ -63,7 +63,7 @@ public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTest @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } protected PsiElement configureAndResolve(String text) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java index f54257b5683..3b6a7313092 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,90 +34,90 @@ public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibr @RunWith(JUnit3RunnerWithInners.class) public static class Usercode extends AbstractNavigateToLibrarySourceTest { public void testAllFilesPresentInUsercode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt"); doTest(fileName); } @TestMetadata("Enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt"); doTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt"); doTest(fileName); } @TestMetadata("GenericFunctionWithExplicitlyDeclaredTypeArguments.kt") public void testGenericFunctionWithExplicitlyDeclaredTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt"); doTest(fileName); } @TestMetadata("GenericFunctionWithInferredTypeArguments.kt") public void testGenericFunctionWithInferredTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt"); doTest(fileName); } @TestMetadata("GlobalFunction.kt") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt"); doTest(fileName); } @TestMetadata("GlobalProperty.kt") public void testGlobalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt"); doTest(fileName); } @TestMetadata("OverloadedFunWithTypeParam.kt") public void testOverloadedFunWithTypeParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt"); doTest(fileName); } @TestMetadata("Property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt"); doTest(fileName); } @TestMetadata("SameNameInDifferentSources.kt") public void testSameNameInDifferentSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt"); doTest(fileName); } @TestMetadata("TypeWithSameShortName.kt") public void testTypeWithSameShortName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt"); doTest(fileName); } } @@ -127,90 +127,90 @@ public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibr @RunWith(JUnit3RunnerWithInners.class) public static class UsercodeWithJSModule extends AbstractNavigateToLibrarySourceTest { public void testAllFilesPresentInUsercodeWithJSModule() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/navigation/usercode"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ClassObject.kt"); doWithJSModuleTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Constructor.kt"); doWithJSModuleTest(fileName); } @TestMetadata("Enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Enum.kt"); doWithJSModuleTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt"); doWithJSModuleTest(fileName); } @TestMetadata("ExtensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt"); doWithJSModuleTest(fileName); } @TestMetadata("GenericFunctionWithExplicitlyDeclaredTypeArguments.kt") public void testGenericFunctionWithExplicitlyDeclaredTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt"); doWithJSModuleTest(fileName); } @TestMetadata("GenericFunctionWithInferredTypeArguments.kt") public void testGenericFunctionWithInferredTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt"); doWithJSModuleTest(fileName); } @TestMetadata("GlobalFunction.kt") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalFunction.kt"); doWithJSModuleTest(fileName); } @TestMetadata("GlobalProperty.kt") public void testGlobalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/GlobalProperty.kt"); doWithJSModuleTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/NamedObject.kt"); doWithJSModuleTest(fileName); } @TestMetadata("OverloadedFunWithTypeParam.kt") public void testOverloadedFunWithTypeParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt"); doWithJSModuleTest(fileName); } @TestMetadata("Property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/Property.kt"); doWithJSModuleTest(fileName); } @TestMetadata("SameNameInDifferentSources.kt") public void testSameNameInDifferentSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt"); doWithJSModuleTest(fileName); } @TestMetadata("TypeWithSameShortName.kt") public void testTypeWithSameShortName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt"); doWithJSModuleTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index b42ed38eaae..dea1715cac8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -26,7 +26,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.util.indexing.FileContentImpl import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.addIfNotNull import org.junit.Assert @@ -48,12 +48,12 @@ public abstract class AbstractClsStubBuilderTest : LightCodeInsightFixtureTestCa val expectedText = stubTreeFromDecompiledText.serializeToString() Assert.assertEquals(expectedText, stubTreeFromCls.serializeToString()) if (txtFile != null) { - JetTestUtils.assertEqualsToFile(txtFile, expectedText) + KotlinTestUtils.assertEqualsToFile(txtFile, expectedText) } } private fun getClassFileToDecompile(sourcePath: String): VirtualFile { - val outDir = JetTestUtils.tmpDir("libForStubTest-" + sourcePath) + val outDir = KotlinTestUtils.tmpDir("libForStubTest-" + sourcePath) MockLibraryUtil.compileKotlin(sourcePath, outDir) val root = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(outDir)!! return root.findClassFileByName(lastSegment(sourcePath)) @@ -64,7 +64,7 @@ public abstract class AbstractClsStubBuilderTest : LightCodeInsightFixtureTestCa } } -internal fun StubElement.serializeToString(): String { +fun StubElement.serializeToString(): String { return AbstractStubBuilderTest.serializeStubToString(this) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index 3c431cec5e8..bb075b52f58 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,162 +32,162 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest { public void testAllFilesPresentInStubBuilder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/stubBuilder"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/stubBuilder"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("AnnotatedFlexibleTypes") public void testAnnotatedFlexibleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/"); doTest(fileName); } @TestMetadata("AnnotationClass") public void testAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotationClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/AnnotationClass/"); doTest(fileName); } @TestMetadata("Annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Annotations/"); doTest(fileName); } @TestMetadata("ClassMembers") public void testClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassMembers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassMembers/"); doTest(fileName); } @TestMetadata("ClassObject") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/ClassObject/"); doTest(fileName); } @TestMetadata("Const") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Const/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Const/"); doTest(fileName); } @TestMetadata("DataClass") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DataClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DataClass/"); doTest(fileName); } @TestMetadata("Delegation") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Delegation/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Delegation/"); doTest(fileName); } @TestMetadata("DependencyOnNestedClasses") public void testDependencyOnNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/"); doTest(fileName); } @TestMetadata("Enum") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Enum/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Enum/"); doTest(fileName); } @TestMetadata("FlexibleTypes") public void testFlexibleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/FlexibleTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/FlexibleTypes/"); doTest(fileName); } @TestMetadata("InheritingClasses") public void testInheritingClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/InheritingClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/InheritingClasses/"); doTest(fileName); } @TestMetadata("LocalClass") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/LocalClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/LocalClass/"); doTest(fileName); } @TestMetadata("Modifiers") public void testModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Modifiers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Modifiers/"); doTest(fileName); } @TestMetadata("MultifileClass") public void testMultifileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/MultifileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/MultifileClass/"); doTest(fileName); } @TestMetadata("NamedCompanionObject") public void testNamedCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NamedCompanionObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NamedCompanionObject/"); doTest(fileName); } @TestMetadata("NestedClasses") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/NestedClasses/"); doTest(fileName); } @TestMetadata("Objects") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Objects/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Objects/"); doTest(fileName); } @TestMetadata("PrivateToThis") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/PrivateToThis/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/PrivateToThis/"); doTest(fileName); } @TestMetadata("Sealed") public void testSealed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Sealed/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Sealed/"); doTest(fileName); } @TestMetadata("SecondaryConstructors") public void testSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/SecondaryConstructors/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/SecondaryConstructors/"); doTest(fileName); } @TestMetadata("TopLevelMembersAnnotatedKt") public void testTopLevelMembersAnnotatedKt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/"); doTest(fileName); } @TestMetadata("TopLevelMembersKt") public void testTopLevelMembersKt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersKt/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TopLevelMembersKt/"); doTest(fileName); } @TestMetadata("TypeBoundsAndDelegationSpecifiers") public void testTypeBoundsAndDelegationSpecifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/"); doTest(fileName); } @TestMetadata("TypeParams") public void testTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeParams/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/TypeParams/"); doTest(fileName); } @TestMetadata("Types") public void testTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Types/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/stubBuilder/Types/"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt index 675c765efe8..3deb9a72430 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.ClassId @@ -32,5 +32,5 @@ public class ClsStubConsistencyTest : StubConsistencyBaseTest() { override fun getDecompiledText(packageFile: VirtualFile): String = buildDecompiledText(packageFile).text - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index f10dc385560..7ab907e8379 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import java.io.File import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { @@ -35,6 +35,6 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt index 78812dabec9..51f059c8bed 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/StubConsistencyBaseTest.kt @@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.compiled.ClsStubBuilder import com.intellij.util.indexing.FileContentImpl -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder import org.junit.Assert -public abstract class StubConsistencyBaseTest : JetLightCodeInsightFixtureTestCase() { +public abstract class StubConsistencyBaseTest : KotlinLightCodeInsightFixtureTestCase() { protected abstract fun getFileIds(): List protected abstract fun getVirtualFileFinder(): VirtualFileFinder diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt index 7c2f813610d..07ae49ad308 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt @@ -24,8 +24,8 @@ import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import kotlin.test.fail @@ -33,7 +33,7 @@ import kotlin.test.fail public abstract class AbstractDecompiledTextBaseTest( baseDirectory: String, private val isJsLibrary: Boolean = false -) : JetLightCodeInsightFixtureTestCase() { +) : KotlinLightCodeInsightFixtureTestCase() { protected val TEST_DATA_PATH: String = PluginTestCaseBase.getTestDataPathBase() + baseDirectory protected val TEST_PACKAGE: String = "test" @@ -52,7 +52,7 @@ public abstract class AbstractDecompiledTextBaseTest( override fun getProjectDescriptor(): LightProjectDescriptor { if (isAllFilesPresentInTest()) { - return JetLightProjectDescriptor.INSTANCE + return KotlinLightProjectDescriptor.INSTANCE } return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(false), false, isJsLibrary) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java index d3da0ade15b..3b1b50ec033 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,95 +33,95 @@ import java.util.regex.Pattern; public class CommonDecompiledTextFromJsMetadataTestGenerated extends AbstractCommonDecompiledTextFromJsMetadataTest { @TestMetadata("DependencyOnNestedClasses") public void ignoredDependencyOnNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/"); doTest(fileName); } @TestMetadata("FlexibleTypes") public void ignoredFlexibleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/"); doTest(fileName); } @TestMetadata("NestedClasses") public void ignoredNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/"); doTest(fileName); } @TestMetadata("SecondaryConstructors") public void ignoredSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/"); doTest(fileName); } public void testAllFilesPresentInDecompiledText() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("Annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/"); doTest(fileName); } @TestMetadata("AnnotationsOnPrimaryCtr") public void testAnnotationsOnPrimaryCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/"); doTest(fileName); } @TestMetadata("ClassWithClassObject") public void testClassWithClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/"); doTest(fileName); } @TestMetadata("ClassWithNamedClassObject") public void testClassWithNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/"); doTest(fileName); } @TestMetadata("Const") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/"); doTest(fileName); } @TestMetadata("Enum") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/"); doTest(fileName); } @TestMetadata("FunctionTypes") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/"); doTest(fileName); } @TestMetadata("Inherited") public void testInherited() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/"); doTest(fileName); } @TestMetadata("Modifiers") public void testModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/"); doTest(fileName); } @TestMetadata("Object") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/"); doTest(fileName); } @TestMetadata("SimpleClass") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/"); doTest(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java index b8ebbb7770a..6a2babb7b24 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,96 +32,96 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CommonDecompiledTextTestGenerated extends AbstractCommonDecompiledTextTest { public void testAllFilesPresentInDecompiledText() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("Annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Annotations/"); doTest(fileName); } @TestMetadata("AnnotationsOnPrimaryCtr") public void testAnnotationsOnPrimaryCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/AnnotationsOnPrimaryCtr/"); doTest(fileName); } @TestMetadata("ClassWithClassObject") public void testClassWithClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithClassObject/"); doTest(fileName); } @TestMetadata("ClassWithNamedClassObject") public void testClassWithNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/ClassWithNamedClassObject/"); doTest(fileName); } @TestMetadata("Const") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Const/"); doTest(fileName); } @TestMetadata("DependencyOnNestedClasses") public void testDependencyOnNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/DependencyOnNestedClasses/"); doTest(fileName); } @TestMetadata("Enum") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Enum/"); doTest(fileName); } @TestMetadata("FlexibleTypes") public void testFlexibleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FlexibleTypes/"); doTest(fileName); } @TestMetadata("FunctionTypes") public void testFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/FunctionTypes/"); doTest(fileName); } @TestMetadata("Inherited") public void testInherited() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Inherited/"); doTest(fileName); } @TestMetadata("Modifiers") public void testModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Modifiers/"); doTest(fileName); } @TestMetadata("NestedClasses") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/NestedClasses/"); doTest(fileName); } @TestMetadata("Object") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/Object/"); doTest(fileName); } @TestMetadata("SecondaryConstructors") public void testSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SecondaryConstructors/"); doTest(fileName); } @TestMetadata("SimpleClass") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/SimpleClass/"); doTest(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 4f19932a425..4c732d52703 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder @@ -54,7 +54,7 @@ public class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { ).moduleDescriptor override fun getProjectDescriptor() = - object : JetWithJdkAndRuntimeLightProjectDescriptor() { + object : KotlinWithJdkAndRuntimeLightProjectDescriptor() { override fun getSdk() = PluginTestCaseBase.fullJdk() } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index f0819fa5cb6..cb3a622a4d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -23,15 +23,15 @@ import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest import org.jetbrains.kotlin.idea.decompiler.KtClsFile import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName -import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert import java.io.File public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() { override fun getProjectDescriptor(): LightProjectDescriptor { - return JetJdkAndLibraryProjectDescriptor(File(JetTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) } fun testSyntheticClassIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClasses() diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java index 82c068ce470..11039287c19 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JsDecompiledTextFromJsMetadataTestGenerated extends AbstractJsDecompiledTextFromJsMetadataTest { public void testAllFilesPresentInDecompiledTextJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJs"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJs"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("TestPackage") public void testTestPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJs/TestPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJs/TestPackage/"); doTest(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java index 3bb8ee878a2..ec13e2ca6e7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,24 +32,24 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JvmDecompiledTextTestGenerated extends AbstractJvmDecompiledTextTest { public void testAllFilesPresentInDecompiledTextJvm() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/decompiler/decompiledTextJvm"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("Modifiers") public void testModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/Modifiers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/Modifiers/"); doTest(fileName); } @TestMetadata("MultifileClass") public void testMultifileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/MultifileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/MultifileClass/"); doTest(fileName); } @TestMetadata("TestKt") public void testTestKt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/TestKt/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/TestKt/"); doTest(fileName); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt index bf2e2e79073..e33ff077f72 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.storage.LockBasedStorageManager -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.sure @@ -53,7 +53,7 @@ public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBase override fun getModuleDescriptor(): ModuleDescriptor { val stdlibJar = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath.absolutePath - val module = JetTestUtils.createEmptyModule("", JsPlatform) + val module = KotlinTestUtils.createEmptyModule("", JsPlatform) val metadata = KotlinJavascriptMetadataUtils.loadMetadata(stdlibJar) assert(metadata.size() == 1) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt index e381a8a94a6..f1755b697ae 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass import org.junit.Assert -public abstract class TextConsistencyBaseTest : JetLightCodeInsightFixtureTestCase() { +public abstract class TextConsistencyBaseTest : KotlinLightCodeInsightFixtureTestCase() { protected abstract fun getPackages(): List diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java index 75979115db3..a26f7b633f8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractQuickDocProviderTest.java @@ -24,7 +24,7 @@ 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.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.util.JetTestUtilsKt; @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.test.util.JetTestUtilsKt; import java.io.File; import java.util.List; -public abstract class AbstractQuickDocProviderTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractQuickDocProviderTest extends KotlinLightCodeInsightFixtureTestCase { public void doTest(@NotNull String path) throws Exception { JetTestUtilsKt.configureWithExtraFile(myFixture, path, "_Data"); diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java index 0e37d1f28e6..e805e8d1c63 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocProviderTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,128 +30,128 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/editor/quickDoc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProviderTest { +public class QuickDocProviderTestGenerated extends AbstractQuickDocProviderTest { public void testAllFilesPresentInQuickDoc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), true); } @TestMetadata("AtFunctionParameter.kt") public void testAtFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtFunctionParameter.kt"); doTest(fileName); } @TestMetadata("AtTypeParameter.kt") public void testAtTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtTypeParameter.kt"); doTest(fileName); } @TestMetadata("AtVariableDeclaration.kt") public void testAtVariableDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtVariableDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtVariableDeclaration.kt"); doTest(fileName); } @TestMetadata("JavaClassUsedInKotlin.kt") public void testJavaClassUsedInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt"); doTest(fileName); } @TestMetadata("JavaMethodUsedInKotlin.kt") public void testJavaMethodUsedInKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt"); doTest(fileName); } @TestMetadata("KotlinClassUsedFromJava.java") public void testKotlinClassUsedFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java"); doTest(fileName); } @TestMetadata("KotlinPackageClassUsedFromJava.java") public void testKotlinPackageClassUsedFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java"); doTest(fileName); } @TestMetadata("MethodFromStdLib.kt") public void testMethodFromStdLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/MethodFromStdLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/MethodFromStdLib.kt"); doTest(fileName); } @TestMetadata("OnClassDeclarationWithNoPackage.kt") public void testOnClassDeclarationWithNoPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt"); doTest(fileName); } @TestMetadata("OnFunctionDeclarationWithPackage.kt") public void testOnFunctionDeclarationWithPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt"); doTest(fileName); } @TestMetadata("OnInheritedMethodUsage.kt") public void testOnInheritedMethodUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedMethodUsage.kt"); doTest(fileName); } @TestMetadata("OnInheritedPropertyUsage.kt") public void testOnInheritedPropertyUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnInheritedPropertyUsage.kt"); doTest(fileName); } @TestMetadata("OnMethodUsage.kt") public void testOnMethodUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsage.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageMultiline.kt") public void testOnMethodUsageMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageWithBracketsInParam.kt") public void testOnMethodUsageWithBracketsInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageWithCodeBlock.kt") public void testOnMethodUsageWithCodeBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageWithMarkdown.kt") public void testOnMethodUsageWithMarkdown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageWithReturnAndThrows.kt") public void testOnMethodUsageWithReturnAndThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt"); doTest(fileName); } @TestMetadata("OnMethodUsageWithSee.kt") public void testOnMethodUsageWithSee() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt"); doTest(fileName); } @TestMetadata("TopLevelMethodFromJava.java") public void testTopLevelMethodFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java index a69dd1ab4bc..a19492ebaa4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java @@ -27,7 +27,7 @@ import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.test.SettingsConfigurator; import org.junit.Assert; @@ -123,6 +123,6 @@ public abstract class AbstractKotlinFoldingTest extends LightCodeInsightFixtureT @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java index 44192ef2525..eb3228dc191 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.folding; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,48 +34,48 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { @RunWith(JUnit3RunnerWithInners.class) public static class NoCollapse extends AbstractKotlinFoldingTest { public void testAllFilesPresentInNoCollapse() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/class.kt"); doTest(fileName); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/function.kt"); doTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/imports.kt"); doTest(fileName); } @TestMetadata("kdocComments.kt") public void testKdocComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/kdocComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/kdocComments.kt"); doTest(fileName); } @TestMetadata("multilineComments.kt") public void testMultilineComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/multilineComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/multilineComments.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/object.kt"); doTest(fileName); } @TestMetadata("oneImport.kt") public void testOneImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/oneImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/noCollapse/oneImport.kt"); doTest(fileName); } } @@ -85,36 +85,36 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { @RunWith(JUnit3RunnerWithInners.class) public static class CheckCollapse extends AbstractKotlinFoldingTest { public void testAllFilesPresentInCheckCollapse() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("customRegions.kt") public void testCustomRegions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/customRegions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/customRegions.kt"); doSettingsFoldingTest(fileName); } @TestMetadata("functionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/functionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/functionLiteral.kt"); doSettingsFoldingTest(fileName); } @TestMetadata("headerKDoc.kt") public void testHeaderKDoc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerKDoc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerKDoc.kt"); doSettingsFoldingTest(fileName); } @TestMetadata("headerMultilineComment.kt") public void testHeaderMultilineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerMultilineComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerMultilineComment.kt"); doSettingsFoldingTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/imports.kt"); doSettingsFoldingTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java index cb5260fdf08..82ae9672057 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,168 +34,168 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractHierarchyTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("CaretAtAnnotation") public void testCaretAtAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtAnnotation/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtAnnotation/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtConstructor") public void testCaretAtConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtConstructor/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtConstructor/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtFabricMethod") public void testCaretAtFabricMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtFabricMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtFabricMethod/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtImport") public void testCaretAtImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtImport/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtImport/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtJavaType") public void testCaretAtJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtJavaType/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtJavaType/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtModifierList") public void testCaretAtModifierList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtModifierList/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtModifierList/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtReceiverExtFun") public void testCaretAtReceiverExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtSuperCall") public void testCaretAtSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSuperCall/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSuperCall/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtSupertypesList") public void testCaretAtSupertypesList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSupertypesList/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSupertypesList/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretAtTypeReference") public void testCaretAtTypeReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtTypeReference/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtTypeReference/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("CaretInClassBody") public void testCaretInClassBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretInClassBody/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretInClassBody/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("ClassFromClass") public void testClassFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromClass/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("ClassFromObject") public void testClassFromObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromObject/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("ClassInClassObject") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInClassObject/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("ClassInPackage") public void testClassInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInPackage/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("InnerClass") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/InnerClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/InnerClass/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("JKJHierarchy") public void testJKJHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JKJHierarchy/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JKJHierarchy/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("JavaFromKotlin") public void testJavaFromKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlin/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("JavaFromKotlinByRef") public void testJavaFromKotlinByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("JavaFromKotlinForKotlinClass") public void testJavaFromKotlinForKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("JetInt") public void testJetInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JetInt/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JetInt/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("KJKHierarchy") public void testKJKHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KJKHierarchy/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KJKHierarchy/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("KotlinFromJava") public void testKotlinFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJava/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJava/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("KotlinFromJavaByRef") public void testKotlinFromJavaByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("KotlinFromKotlinByRef") public void testKotlinFromKotlinByRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("Object") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/Object/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/Object/"); doTypeClassHierarchyTest(fileName); } @TestMetadata("TwoChildren") public void testTwoChildren() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/TwoChildren/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/TwoChildren/"); doTypeClassHierarchyTest(fileName); } } @@ -205,18 +205,18 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Super extends AbstractHierarchyTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("JetList") public void testJetList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/JetList/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/JetList/"); doSuperClassHierarchyTest(fileName); } @TestMetadata("TwoTraits") public void testTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/TwoTraits/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/TwoTraits/"); doSuperClassHierarchyTest(fileName); } } @@ -226,54 +226,54 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Sub extends AbstractHierarchyTest { public void testAllFilesPresentInSub() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("AllFromClass") public void testAllFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromClass/"); doSubClassHierarchyTest(fileName); } @TestMetadata("AllFromTrait") public void testAllFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromTrait/"); doSubClassHierarchyTest(fileName); } @TestMetadata("ClassFromClass") public void testClassFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromClass/"); doSubClassHierarchyTest(fileName); } @TestMetadata("ClassFromTrait") public void testClassFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromTrait/"); doSubClassHierarchyTest(fileName); } @TestMetadata("ObjectFromClass") public void testObjectFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromClass/"); doSubClassHierarchyTest(fileName); } @TestMetadata("ObjectFromTrait") public void testObjectFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromTrait/"); doSubClassHierarchyTest(fileName); } @TestMetadata("TraitFromClass") public void testTraitFromClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromClass/"); doSubClassHierarchyTest(fileName); } @TestMetadata("TraitFromTrait") public void testTraitFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromTrait/"); doSubClassHierarchyTest(fileName); } } @@ -283,132 +283,132 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Callers extends AbstractHierarchyTest { public void testAllFilesPresentInCallers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("javaConstructor") public void testJavaConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaConstructor/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaConstructor/"); doCallerHierarchyTest(fileName); } @TestMetadata("javaMethod") public void testJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaMethod/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinClass") public void testKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinClass/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinFunction") public void testKotlinFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunction/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinFunctionNonCallUsages") public void testKotlinFunctionNonCallUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunctionNonCallUsages/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunctionNonCallUsages/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinInterface") public void testKotlinInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinInterface/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinInterface/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinLocalClass") public void testKotlinLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalClass/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinLocalFunction") public void testKotlinLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinLocalFunctionWithNonLocalCallers") public void testKotlinLocalFunctionWithNonLocalCallers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunctionWithNonLocalCallers/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunctionWithNonLocalCallers/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinNestedClass") public void testKotlinNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedClass/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinNestedInnerClass") public void testKotlinNestedInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPackageFunction") public void testKotlinPackageFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPackageProperty") public void testKotlinPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPrimaryConstructorImplicitCalls") public void testKotlinPrimaryConstructorImplicitCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrimaryConstructorImplicitCalls/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrimaryConstructorImplicitCalls/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPrivateClass") public void testKotlinPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPrivateFunction") public void testKotlinPrivateFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinPrivateProperty") public void testKotlinPrivateProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinProperty") public void testKotlinProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinProperty/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinSecondaryConstructor") public void testKotlinSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructor/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructor/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinSecondaryConstructorImplicitCalls") public void testKotlinSecondaryConstructorImplicitCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructorImplicitCalls/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinSecondaryConstructorImplicitCalls/"); doCallerHierarchyTest(fileName); } @TestMetadata("kotlinUnresolvedFunction") public void testKotlinUnresolvedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinUnresolvedFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinUnresolvedFunction/"); doCallerHierarchyTest(fileName); } } @@ -418,96 +418,96 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Callees extends AbstractHierarchyTest { public void testAllFilesPresentInCallees() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("javaConstructor") public void testJavaConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaConstructor/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaConstructor/"); doCalleeHierarchyTest(fileName); } @TestMetadata("javaMethod") public void testJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaMethod/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaMethod/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinAnonymousObject") public void testKotlinAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinClass") public void testKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClass/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinClassObject") public void testKotlinClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClassObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClassObject/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinEnumClass") public void testKotlinEnumClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinEnumClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinEnumClass/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinFunction") public void testKotlinFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinFunction/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinInterface") public void testKotlinInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinInterface/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinInterface/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinLocalClass") public void testKotlinLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalClass/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinLocalFunction") public void testKotlinLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinNestedClass") public void testKotlinNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinNestedClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinNestedClass/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinObject") public void testKotlinObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinObject/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinObject/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinPackageFunction") public void testKotlinPackageFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinPackageProperty") public void testKotlinPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/"); doCalleeHierarchyTest(fileName); } @TestMetadata("kotlinProperty") public void testKotlinProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinProperty/"); doCalleeHierarchyTest(fileName); } } @@ -517,42 +517,42 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @RunWith(JUnit3RunnerWithInners.class) public static class Overrides extends AbstractHierarchyTest { public void testAllFilesPresentInOverrides() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("javaMethodInClass") public void testJavaMethodInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInClass/"); doOverrideHierarchyTest(fileName); } @TestMetadata("javaMethodInInterface") public void testJavaMethodInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInInterface/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInInterface/"); doOverrideHierarchyTest(fileName); } @TestMetadata("kotlinFunctionInClass") public void testKotlinFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInClass/"); doOverrideHierarchyTest(fileName); } @TestMetadata("kotlinFunctionInTrait") public void testKotlinFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/"); doOverrideHierarchyTest(fileName); } @TestMetadata("kotlinPropertyInClass") public void testKotlinPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInClass/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInClass/"); doOverrideHierarchyTest(fileName); } @TestMetadata("kotlinPropertyInTrait") public void testKotlinPropertyInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/"); doOverrideHierarchyTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index 19a8ed0099a..1418a0c50b5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinLiteFixture; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.lang.reflect.Field; @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { +public abstract class AbstractDiagnosticMessageTest extends KotlinLiteFixture { private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER"; private static final String DIAGNOSTICS_DIRECTIVE = "DIAGNOSTICS"; private static final String MESSAGE_TYPE_DIRECTIVE = "MESSAGE_TYPE"; @@ -82,8 +82,8 @@ public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { File file = new File(filePath); String fileName = file.getName(); - String fileData = JetTestUtils.doLoadFile(file); - Map directives = JetTestUtils.parseDirectives(fileData); + String fileData = KotlinTestUtils.doLoadFile(file); + Map directives = KotlinTestUtils.parseDirectives(fileData); int diagnosticNumber = getDiagnosticNumber(directives); final Set> diagnosticFactories = getDiagnosticFactories(directives); MessageType messageType = getMessageTypeDirective(directives); diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java index acc7c407aea..210cdc093e7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java @@ -22,19 +22,19 @@ 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.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.TagsTestDataUtil; import java.io.File; import java.util.List; -public abstract class AbstractHighlightingTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractHighlightingTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } protected void doTest(String filePath) throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractUsageHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractUsageHighlightingTest.kt index c6ffd266cf9..acd5cc22c58 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractUsageHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractUsageHighlightingTest.kt @@ -21,10 +21,10 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfoType import com.intellij.codeInsight.highlighting.actions.HighlightUsagesAction import com.intellij.openapi.command.WriteCommandAction import com.intellij.testFramework.ExpectedHighlightingData -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor -public abstract class AbstractUsageHighlightingTest: JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractUsageHighlightingTest: KotlinLightCodeInsightFixtureTestCase() { companion object { // Not standard to leave it in text after configureByFile and remove manually after collecting highlighting information val CARET_TAG = "~" @@ -63,6 +63,6 @@ public abstract class AbstractUsageHighlightingTest: JetLightCodeInsightFixtureT - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE override fun getTestDataPath() = "" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java index f442a849d82..d020cc63877 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,18 +32,18 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DiagnosticMessageJsTestGenerated extends AbstractDiagnosticMessageJsTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage/js"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage/js"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("jsCodeErrorHtml.kt") public void testJsCodeErrorHtml() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorHtml.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorHtml.kt"); doTest(fileName); } @TestMetadata("jsCodeErrorText.kt") public void testJsCodeErrorText() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorText.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/js/jsCodeErrorText.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java index d1f8fa31517..26aec84d2bb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,185 +33,185 @@ import java.util.regex.Pattern; public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTest { @TestMetadata("abstractBaseClassMemberNotImplemented.kt") public void testAbstractBaseClassMemberNotImplemented() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/abstractBaseClassMemberNotImplemented.kt"); doTest(fileName); } public void testAllFilesPresentInDiagnosticMessage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("annotationsForResolve.kt") public void testAnnotationsForResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/annotationsForResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/annotationsForResolve.kt"); doTest(fileName); } @TestMetadata("assignedButNeverAccessedVariable.kt") public void testAssignedButNeverAccessedVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt"); doTest(fileName); } @TestMetadata("cannotInferVisibility.kt") public void testCannotInferVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotInferVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotInferVisibility.kt"); doTest(fileName); } @TestMetadata("cannotOverrideInvisibleMember.kt") public void testCannotOverrideInvisibleMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt"); doTest(fileName); } @TestMetadata("conflictingOverloadsClass.kt") public void testConflictingOverloadsClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt"); doTest(fileName); } @TestMetadata("conflictingOverloadsDefaultPackage.kt") public void testConflictingOverloadsDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt"); doTest(fileName); } @TestMetadata("conflictingSubstitutions.kt") public void testConflictingSubstitutions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingSubstitutions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingSubstitutions.kt"); doTest(fileName); } @TestMetadata("constructorsRedeclaration.kt") public void testConstructorsRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclaration.kt"); doTest(fileName); } @TestMetadata("constructorsRedeclarationTopLevel.kt") public void testConstructorsRedeclarationTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/constructorsRedeclarationTopLevel.kt"); doTest(fileName); } @TestMetadata("differentNamesForSameParameter.kt") public void testDifferentNamesForSameParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt"); doTest(fileName); } @TestMetadata("extensionInClassReference.kt") public void testExtensionInClassReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/extensionInClassReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/extensionInClassReference.kt"); doTest(fileName); } @TestMetadata("functionPlaceholder.kt") public void testFunctionPlaceholder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/functionPlaceholder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/functionPlaceholder.kt"); doTest(fileName); } @TestMetadata("invisibleMember.kt") public void testInvisibleMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/invisibleMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/invisibleMember.kt"); doTest(fileName); } @TestMetadata("multipleDefaultsFromSupertypes.kt") public void testMultipleDefaultsFromSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt"); doTest(fileName); } @TestMetadata("nameInConstraintIsNotATypeParameter.kt") public void testNameInConstraintIsNotATypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt"); doTest(fileName); } @TestMetadata("nestedClassAcessedViaInstanceReference.kt") public void testNestedClassAcessedViaInstanceReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt"); doTest(fileName); } @TestMetadata("nestedClassShouldBeQualified.kt") public void testNestedClassShouldBeQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt"); doTest(fileName); } @TestMetadata("noneApplicable.kt") public void testNoneApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicable.kt"); doTest(fileName); } @TestMetadata("noneApplicableGeneric.kt") public void testNoneApplicableGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableGeneric.kt"); doTest(fileName); } @TestMetadata("numberValueTypes.kt") public void testNumberValueTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/numberValueTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/numberValueTypes.kt"); doTest(fileName); } @TestMetadata("renderCollectionOfTypes.kt") public void testRenderCollectionOfTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt"); doTest(fileName); } @TestMetadata("typeInferenceCannotCaptureTypes.kt") public void testTypeInferenceCannotCaptureTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt"); doTest(fileName); } @TestMetadata("typeInferenceExpectedTypeMismatch.kt") public void testTypeInferenceExpectedTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt"); doTest(fileName); } @TestMetadata("typeMismatchWithNothing.kt") public void testTypeMismatchWithNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt"); doTest(fileName); } @TestMetadata("typeParameterAsReified.kt") public void testTypeParameterAsReified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeParameterAsReified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeParameterAsReified.kt"); doTest(fileName); } @TestMetadata("unusedParameter.kt") public void testUnusedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedParameter.kt"); doTest(fileName); } @TestMetadata("unusedValue.kt") public void testUnusedValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedValue.kt"); doTest(fileName); } @TestMetadata("unusedVariable.kt") public void testUnusedVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedVariable.kt"); doTest(fileName); } @TestMetadata("upperBoundViolated.kt") public void testUpperBoundViolated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/upperBoundViolated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/upperBoundViolated.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java index ee89a4b2290..b11eb48fed9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,96 +32,96 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class HighlightExitPointsTestGenerated extends AbstractHighlightExitPointsTest { public void testAllFilesPresentInExitPoints() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/exitPoints"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/exitPoints"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inline1.kt") public void testInline1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inline1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inline1.kt"); doTest(fileName); } @TestMetadata("inline2.kt") public void testInline2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inline2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inline2.kt"); doTest(fileName); } @TestMetadata("inlineLocalReturn1.kt") public void testInlineLocalReturn1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn1.kt"); doTest(fileName); } @TestMetadata("inlineLocalReturn2.kt") public void testInlineLocalReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineLocalReturn2.kt"); doTest(fileName); } @TestMetadata("inlineWithNoInlineParam.kt") public void testInlineWithNoInlineParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inlineWithNoInlineParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/inlineWithNoInlineParam.kt"); doTest(fileName); } @TestMetadata("invalidReturn.kt") public void testInvalidReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/invalidReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/invalidReturn.kt"); doTest(fileName); } @TestMetadata("invalidThrow.kt") public void testInvalidThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/invalidThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/invalidThrow.kt"); doTest(fileName); } @TestMetadata("localFunction1.kt") public void testLocalFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction1.kt"); doTest(fileName); } @TestMetadata("localFunction2.kt") public void testLocalFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction2.kt"); doTest(fileName); } @TestMetadata("localFunctionThrow.kt") public void testLocalFunctionThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/localFunctionThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/localFunctionThrow.kt"); doTest(fileName); } @TestMetadata("notInline1.kt") public void testNotInline1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/notInline1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/notInline1.kt"); doTest(fileName); } @TestMetadata("notInline2.kt") public void testNotInline2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/notInline2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/notInline2.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/simple.kt"); doTest(fileName); } @TestMetadata("throw1.kt") public void testThrow1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/throw1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/throw1.kt"); doTest(fileName); } @TestMetadata("throw2.kt") public void testThrow2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/throw2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/exitPoints/throw2.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java index 247e72c9d26..aa59800f683 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class HighlightingTestGenerated extends AbstractHighlightingTest { public void testAllFilesPresentInHighlighter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Annotations.kt") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Annotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Annotations.kt"); doTest(fileName); } @TestMetadata("Dynamic.kt") public void testDynamic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Dynamic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Dynamic.kt"); doTest(fileName); } @TestMetadata("Enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Enums.kt"); doTest(fileName); } @TestMetadata("Field.kt") public void testField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Field.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Field.kt"); doTest(fileName); } @TestMetadata("Functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Functions.kt"); doTest(fileName); } @TestMetadata("JavaTypes.kt") public void testJavaTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/JavaTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/JavaTypes.kt"); doTest(fileName); } @TestMetadata("KDoc.kt") public void testKDoc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/KDoc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/KDoc.kt"); doTest(fileName); } @TestMetadata("Labels.kt") public void testLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Labels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Labels.kt"); doTest(fileName); } @TestMetadata("Object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Object.kt"); doTest(fileName); } @TestMetadata("Todo.kt") public void testTodo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Todo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Todo.kt"); doTest(fileName); } @TestMetadata("TypesAndAnnotations.kt") public void testTypesAndAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/TypesAndAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/TypesAndAnnotations.kt"); doTest(fileName); } @TestMetadata("Variables.kt") public void testVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Variables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/Variables.kt"); doTest(fileName); } @TestMetadata("VariablesAsFunctions.kt") public void testVariablesAsFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/VariablesAsFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/VariablesAsFunctions.kt"); doTest(fileName); } @@ -118,96 +118,96 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest { @RunWith(JUnit3RunnerWithInners.class) public static class Deprecated extends AbstractHighlightingTest { public void testAllFilesPresentInDeprecated() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Class.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ExtensionFunction.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Function.kt"); doTest(fileName); } @TestMetadata("Get.kt") public void testGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Get.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Get.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Getter.kt"); doTest(fileName); } @TestMetadata("Inc.kt") public void testInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Inc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Inc.kt"); doTest(fileName); } @TestMetadata("Invalid.kt") public void testInvalid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invalid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invalid.kt"); doTest(fileName); } @TestMetadata("Invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invoke.kt"); doTest(fileName); } @TestMetadata("Operation.kt") public void testOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Operation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Operation.kt"); doTest(fileName); } @TestMetadata("Property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Property.kt"); doTest(fileName); } @TestMetadata("RangeTo.kt") public void testRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/RangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/RangeTo.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Setter.kt"); doTest(fileName); } @TestMetadata("SuperCall.kt") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/SuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/SuperCall.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Trait.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index 1e5d0e78fe0..43cdc60c5df 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt @@ -23,15 +23,15 @@ import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully -import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtFile import java.io.File import kotlin.test.assertEquals import kotlin.test.assertTrue -public class NoErrorsInStdlibTest : JetLightCodeInsightFixtureTestCase() { +public class NoErrorsInStdlibTest : KotlinLightCodeInsightFixtureTestCase() { public fun testNoErrors() { val root = myFixture.copyDirectoryToProject("../libraries/stdlib/src", "") @@ -67,7 +67,7 @@ public class NoErrorsInStdlibTest : JetLightCodeInsightFixtureTestCase() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return object : JetJdkAndLibraryProjectDescriptor(File("dist/classes/builtins")) { + return object : KotlinJdkAndLibraryProjectDescriptor(File("dist/classes/builtins")) { override fun getSdk(): Sdk? = PluginTestCaseBase.fullJdk() } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/UsageHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/UsageHighlightingTestGenerated.java index ddc2363033f..aa3d1d3a424 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/UsageHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/UsageHighlightingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class UsageHighlightingTestGenerated extends AbstractUsageHighlightingTest { public void testAllFilesPresentInUsageHighlighter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/usageHighlighter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/usageHighlighter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localVal.kt") public void testLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/usageHighlighter/localVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/usageHighlighter/localVal.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java index fe11270500c..d0492b7555d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.imports; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,198 +32,198 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { public void testAllFilesPresentInOptimizeImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("AlreadyOptimized.kt") public void testAlreadyOptimized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/AlreadyOptimized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/AlreadyOptimized.kt"); doTest(fileName); } @TestMetadata("ArrayAccessExpression.kt") public void testArrayAccessExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ArrayAccessExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ArrayAccessExpression.kt"); doTest(fileName); } @TestMetadata("CallableReference.kt") public void testCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CallableReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CallableReference.kt"); doTest(fileName); } @TestMetadata("ClassFromSameFileImportAddedBug.kt") public void testClassFromSameFileImportAddedBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt"); doTest(fileName); } @TestMetadata("ClassMemberImported.kt") public void testClassMemberImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassMemberImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassMemberImported.kt"); doTest(fileName); } @TestMetadata("ComponentFunction.kt") public void testComponentFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ComponentFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ComponentFunction.kt"); doTest(fileName); } @TestMetadata("CurrentPackage.kt") public void testCurrentPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CurrentPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CurrentPackage.kt"); doTest(fileName); } @TestMetadata("DefaultJsImports.kt") public void testDefaultJsImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultJsImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultJsImports.kt"); doTest(fileName); } @TestMetadata("DefaultObjectReference.kt") public void testDefaultObjectReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultObjectReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultObjectReference.kt"); doTest(fileName); } @TestMetadata("DoNotTouchIfNoChanges.kt") public void testDoNotTouchIfNoChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DoNotTouchIfNoChanges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DoNotTouchIfNoChanges.kt"); doTest(fileName); } @TestMetadata("DuplicatedImports.kt") public void testDuplicatedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports.kt"); doTest(fileName); } @TestMetadata("Enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Enums.kt"); doTest(fileName); } @TestMetadata("FromCompanionObject.kt") public void testFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/FromCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/FromCompanionObject.kt"); doTest(fileName); } @TestMetadata("FromCompanionObjectGeneric.kt") public void testFromCompanionObjectGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/FromCompanionObjectGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/FromCompanionObjectGeneric.kt"); doTest(fileName); } @TestMetadata("InvokeFunction.kt") public void testInvokeFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/InvokeFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/InvokeFunction.kt"); doTest(fileName); } @TestMetadata("IteratorFunction.kt") public void testIteratorFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/IteratorFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/IteratorFunction.kt"); doTest(fileName); } @TestMetadata("JavaStaticField.kt") public void testJavaStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/JavaStaticField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/JavaStaticField.kt"); doTest(fileName); } @TestMetadata("KeywordNames.kt") public void testKeywordNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KeywordNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KeywordNames.kt"); doTest(fileName); } @TestMetadata("Kt1850FullQualified.kt") public void testKt1850FullQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified.kt"); doTest(fileName); } @TestMetadata("Kt1850InnerClass.kt") public void testKt1850InnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850InnerClass.kt"); doTest(fileName); } @TestMetadata("Kt2488EnumEntry.kt") public void testKt2488EnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2488EnumEntry.kt"); doTest(fileName); } @TestMetadata("Kt2709.kt") public void testKt2709() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2709.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2709.kt"); doTest(fileName); } @TestMetadata("MembersInScope.kt") public void testMembersInScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/MembersInScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/MembersInScope.kt"); doTest(fileName); } @TestMetadata("NestedClassInObject.kt") public void testNestedClassInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/NestedClassInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/NestedClassInObject.kt"); doTest(fileName); } @TestMetadata("NestedClassReferenceOutsideClassBody.kt") public void testNestedClassReferenceOutsideClassBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/NestedClassReferenceOutsideClassBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/NestedClassReferenceOutsideClassBody.kt"); doTest(fileName); } @TestMetadata("RemoveImportsIfGeneral.kt") public void testRemoveImportsIfGeneral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral.kt"); doTest(fileName); } @TestMetadata("RemoveImportsIfGeneralBefore.kt") public void testRemoveImportsIfGeneralBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore.kt"); doTest(fileName); } @TestMetadata("SamConstructor.kt") public void testSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/SamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/SamConstructor.kt"); doTest(fileName); } @TestMetadata("StaticMethodFromSuper.kt") public void testStaticMethodFromSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/StaticMethodFromSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/StaticMethodFromSuper.kt"); doTest(fileName); } @TestMetadata("ThisAndSuper.kt") public void testThisAndSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ThisAndSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ThisAndSuper.kt"); doTest(fileName); } @TestMetadata("UnusedImports.kt") public void testUnusedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports.kt"); doTest(fileName); } @TestMetadata("WithAliases.kt") public void testWithAliases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/WithAliases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/WithAliases.kt"); doTest(fileName); } @@ -232,60 +232,60 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { @RunWith(JUnit3RunnerWithInners.class) public static class AllUnderImports extends AbstractOptimizeImportsTest { public void testAllFilesPresentInAllUnderImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports/allUnderImports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports/allUnderImports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("ClassNameConflict.kt") public void testClassNameConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflict.kt"); doTest(fileName); } @TestMetadata("ClassNameConflict2.kt") public void testClassNameConflict2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflict2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflict2.kt"); doTest(fileName); } @TestMetadata("ClassNameConflictWithCurrentPackage.kt") public void testClassNameConflictWithCurrentPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithCurrentPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithCurrentPackage.kt"); doTest(fileName); } @TestMetadata("ClassNameConflictWithCurrentPackage2.kt") public void testClassNameConflictWithCurrentPackage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithCurrentPackage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithCurrentPackage2.kt"); doTest(fileName); } @TestMetadata("ClassNameConflictWithDefault.kt") public void testClassNameConflictWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/ClassNameConflictWithDefault.kt"); doTest(fileName); } @TestMetadata("MemberImports.kt") public void testMemberImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/MemberImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/MemberImports.kt"); doTest(fileName); } @TestMetadata("NameCountSetting.kt") public void testNameCountSetting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/NameCountSetting.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/NameCountSetting.kt"); doTest(fileName); } @TestMetadata("PackagesToUseStarImport.kt") public void testPackagesToUseStarImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/PackagesToUseStarImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/PackagesToUseStarImport.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/allUnderImports/Simple.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt index 9c023503190..9529249fa50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspectionTest.kt @@ -21,15 +21,15 @@ import com.intellij.codeInspection.InspectionManager import com.intellij.codeInspection.ex.GlobalInspectionContextBase import com.intellij.profile.codeInspection.InspectionProjectProfileManager import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -class KotlinCleanupInspectionTest(): JetLightCodeInsightFixtureTestCase() { +class KotlinCleanupInspectionTest(): KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath(): String = PluginTestCaseBase.getTestDataPathBase() + "/inspections/cleanup" - override fun getProjectDescriptor(): LightProjectDescriptor = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE private fun doTest(result: String, vararg files: String) { myFixture.enableInspections(javaClass()) diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 76c567e67f7..263c9d1a24a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.junit.Assert; import org.junit.ComparisonFailure; @@ -178,7 +178,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { checkResultByFile(canonicalPathToExpectedFile); } catch (ComparisonFailure e) { - JetTestUtils.assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor()); + KotlinTestUtils.assertEqualsToFile(new File(canonicalPathToExpectedFile), getEditor()); } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt index 80623e57f18..0fe61e35a6a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Assert import java.io.File @@ -72,7 +72,7 @@ public abstract class AbstractMultiFileIntentionTest : KotlinMultiFileTestCase() assert(conflictFile == null) { "Conflict file $conflictFile should not exist" } } catch (e: CommonRefactoringUtil.RefactoringErrorHintException) { - JetTestUtils.assertEqualsToFile(File(conflictFile!!.path), e.getMessage()!!) + KotlinTestUtils.assertEqualsToFile(File(conflictFile!!.path), e.getMessage()!!) } finally { PsiDocumentManager.getInstance(getProject()!!).commitAllDocuments() diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 8e1fa283ea3..4acf911137f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IntentionTestGenerated extends AbstractIntentionTest { public void testAllFilesPresentInIntentions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/addBraces") @@ -41,54 +41,54 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class AddBraces extends AbstractIntentionTest { @TestMetadata("addBracesForDoWhile.kt") public void testAddBracesForDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForDoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForDoWhile.kt"); doTest(fileName); } @TestMetadata("addBracesForElse.kt") public void testAddBracesForElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForElse.kt"); doTest(fileName); } @TestMetadata("addBracesForFor.kt") public void testAddBracesForFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForFor.kt"); doTest(fileName); } @TestMetadata("addBracesForIf.kt") public void testAddBracesForIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIf.kt"); doTest(fileName); } @TestMetadata("addBracesForIfWithNoSpace.kt") public void testAddBracesForIfWithNoSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt"); doTest(fileName); } @TestMetadata("addBracesForIfWithSemicolon.kt") public void testAddBracesForIfWithSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt"); doTest(fileName); } @TestMetadata("addBracesForWhile.kt") public void testAddBracesForWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForWhile.kt"); doTest(fileName); } @TestMetadata("addBracesWithBraces.kt") public void testAddBracesWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesWithBraces.kt"); doTest(fileName); } public void testAllFilesPresentInAddBraces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addBraces"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addBraces"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } } @@ -97,12 +97,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddConstModifier extends AbstractIntentionTest { public void testAllFilesPresentInAddConstModifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addConstModifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addConstModifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addConstModifier/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addConstModifier/simple.kt"); doTest(fileName); } } @@ -112,84 +112,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddForLoopIndices extends AbstractIntentionTest { public void testAllFilesPresentInAddForLoopIndices() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("explicitParamType.kt") public void testExplicitParamType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/explicitParamType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/explicitParamType.kt"); doTest(fileName); } @TestMetadata("inapplicableExistingIndices.kt") public void testInapplicableExistingIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt"); doTest(fileName); } @TestMetadata("inapplicableInBody.kt") public void testInapplicableInBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableInBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableInBody.kt"); doTest(fileName); } @TestMetadata("inapplicableOnMap.kt") public void testInapplicableOnMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt"); doTest(fileName); } @TestMetadata("inapplicableOverridenFunction.kt") public void testInapplicableOverridenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt"); doTest(fileName); } @TestMetadata("inapplicableUnresolved.kt") public void testInapplicableUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt"); doTest(fileName); } @TestMetadata("intArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/intArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/intArray.kt"); doTest(fileName); } @TestMetadata("iterable.kt") public void testIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/iterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/iterable.kt"); doTest(fileName); } @TestMetadata("noBody.kt") public void testNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/noBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/noBody.kt"); doTest(fileName); } @TestMetadata("objectArray.kt") public void testObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/objectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/objectArray.kt"); doTest(fileName); } @TestMetadata("sequence.kt") public void testSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/sequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/sequence.kt"); doTest(fileName); } @TestMetadata("simpleIntList.kt") public void testSimpleIntList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/simpleIntList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/simpleIntList.kt"); doTest(fileName); } @TestMetadata("string.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/string.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/string.kt"); doTest(fileName); } } @@ -199,114 +199,114 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddNameToArgument extends AbstractIntentionTest { public void testAllFilesPresentInAddNameToArgument() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addNameToArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addNameToArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("alreadyNamed.kt") public void testAlreadyNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/alreadyNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/alreadyNamed.kt"); doTest(fileName); } @TestMetadata("ambiguousCall.kt") public void testAmbiguousCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/ambiguousCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/ambiguousCall.kt"); doTest(fileName); } @TestMetadata("beforeOtherNamed.kt") public void testBeforeOtherNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/beforeOtherNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/beforeOtherNamed.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("incompleteCall.kt") public void testIncompleteCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/incompleteCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/incompleteCall.kt"); doTest(fileName); } @TestMetadata("javaMethod.kt") public void testJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/javaMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/javaMethod.kt"); doTest(fileName); } @TestMetadata("notInsideIndices.kt") public void testNotInsideIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideIndices.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideIndices.kt"); doTest(fileName); } @TestMetadata("notInsideNestedArgumentList.kt") public void testNotInsideNestedArgumentList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideNestedArgumentList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideNestedArgumentList.kt"); doTest(fileName); } @TestMetadata("notInsideNestedArgumentList2.kt") public void testNotInsideNestedArgumentList2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideNestedArgumentList2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notInsideNestedArgumentList2.kt"); doTest(fileName); } @TestMetadata("notLast.kt") public void testNotLast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notLast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notLast.kt"); doTest(fileName); } @TestMetadata("notResolved.kt") public void testNotResolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notResolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/notResolved.kt"); doTest(fileName); } @TestMetadata("rangeForLambda1.kt") public void testRangeForLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda1.kt"); doTest(fileName); } @TestMetadata("rangeForLambda2.kt") public void testRangeForLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda2.kt"); doTest(fileName); } @TestMetadata("rangeForLambda3.kt") public void testRangeForLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/rangeForLambda3.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/simple.kt"); doTest(fileName); } @TestMetadata("vararg1.kt") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg1.kt"); doTest(fileName); } @TestMetadata("vararg2.kt") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg2.kt"); doTest(fileName); } @TestMetadata("vararg3.kt") public void testVararg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addNameToArgument/vararg3.kt"); doTest(fileName); } } @@ -316,48 +316,48 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddOperatorModifier extends AbstractIntentionTest { public void testAllFilesPresentInAddOperatorModifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addOperatorModifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addOperatorModifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("containsBool.kt") public void testContainsBool() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/containsBool.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/containsBool.kt"); doTest(fileName); } @TestMetadata("containsInt.kt") public void testContainsInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/containsInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/containsInt.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/extension.kt"); doTest(fileName); } @TestMetadata("forOverride.kt") public void testForOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/forOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/forOverride.kt"); doTest(fileName); } @TestMetadata("overridden.kt") public void testOverridden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/overridden.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/overridden.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/simple.kt"); doTest(fileName); } @TestMetadata("toplevel.kt") public void testToplevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/toplevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addOperatorModifier/toplevel.kt"); doTest(fileName); } } @@ -367,7 +367,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Branched extends AbstractIntentionTest { public void testAllFilesPresentInBranched() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen") @@ -375,78 +375,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class DoubleBangToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInDoubleBangToIfThen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/doubleBangToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/doubleBangToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callExpression.kt") public void testCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpression.kt"); doTest(fileName); } @TestMetadata("callExpressionParens.kt") public void testCallExpressionParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpressionParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpressionParens.kt"); doTest(fileName); } @TestMetadata("exceptionTextEscapesQuotes.kt") public void testExceptionTextEscapesQuotes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextEscapesQuotes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextEscapesQuotes.kt"); doTest(fileName); } @TestMetadata("exceptionTextHandlesMultiline.kt") public void testExceptionTextHandlesMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt"); doTest(fileName); } @TestMetadata("localVal.kt") public void testLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVal.kt"); doTest(fileName); } @TestMetadata("localVar.kt") public void testLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt"); doTest(fileName); } @TestMetadata("simpleNameExpressionInParens.kt") public void testSimpleNameExpressionInParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/simpleNameExpressionInParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/simpleNameExpressionInParens.kt"); doTest(fileName); } @TestMetadata("topLevelVal.kt") public void testTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVal.kt"); doTest(fileName); } @TestMetadata("topLevelValCustomGetter.kt") public void testTopLevelValCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt"); doTest(fileName); } @TestMetadata("topLevelVar.kt") public void testTopLevelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt"); doTest(fileName); } @TestMetadata("topLevelVarCustomGetter.kt") public void testTopLevelVarCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt"); doTest(fileName); } @TestMetadata("usedInAssignment.kt") public void testUsedInAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/usedInAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/usedInAssignment.kt"); doTest(fileName); } } @@ -456,72 +456,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ElvisToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInElvisToIfThen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/elvisToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/elvisToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callExpression.kt") public void testCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpression.kt"); doTest(fileName); } @TestMetadata("callExpressionParens.kt") public void testCallExpressionParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt"); doTest(fileName); } @TestMetadata("elvisAsExpression.kt") public void testElvisAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt"); doTest(fileName); } @TestMetadata("localValLhs.kt") public void testLocalValLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt"); doTest(fileName); } @TestMetadata("localVarLhs.kt") public void testLocalVarLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt"); doTest(fileName); } @TestMetadata("simpleNameExpression.kt") public void testSimpleNameExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt"); doTest(fileName); } @TestMetadata("simpleNameExpressionInParens.kt") public void testSimpleNameExpressionInParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt"); doTest(fileName); } @TestMetadata("topLevelVal.kt") public void testTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt"); doTest(fileName); } @TestMetadata("topLevelValCustomGetter.kt") public void testTopLevelValCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt"); doTest(fileName); } @TestMetadata("topLevelVar.kt") public void testTopLevelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt"); doTest(fileName); } @TestMetadata("topLevelVarCustomGetter.kt") public void testTopLevelVarCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt"); doTest(fileName); } } @@ -531,7 +531,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Folding extends AbstractIntentionTest { public void testAllFilesPresentInFolding() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment") @@ -539,60 +539,60 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfToAssignment extends AbstractIntentionTest { public void testAllFilesPresentInIfToAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt"); doTest(fileName); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIfWithAugmentedAssignment.kt") public void testSimpleIfWithAugmentedAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleIfWithShadowedVar.kt") public void testSimpleIfWithShadowedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt"); doTest(fileName); } @TestMetadata("simpleIfWithUnmatchedAssignmentOps.kt") public void testSimpleIfWithUnmatchedAssignmentOps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt"); doTest(fileName); } @TestMetadata("simpleIfWithUnmatchedAssignments.kt") public void testSimpleIfWithUnmatchedAssignments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt"); doTest(fileName); } @TestMetadata("simpleIfWithoutElse.kt") public void testSimpleIfWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt"); doTest(fileName); } @TestMetadata("simpleIfWithoutTerminatingAssignment.kt") public void testSimpleIfWithoutTerminatingAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt"); doTest(fileName); } } @@ -602,24 +602,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfToReturn extends AbstractIntentionTest { public void testAllFilesPresentInIfToReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt"); doTest(fileName); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt"); doTest(fileName); } } @@ -629,24 +629,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfToReturnAsymmetrically extends AbstractIntentionTest { public void testAllFilesPresentInIfToReturnAsymmetrically() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleIfWithComments.kt") public void testSimpleIfWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt"); doTest(fileName); } } @@ -656,42 +656,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class WhenToAssignment extends AbstractIntentionTest { public void testAllFilesPresentInWhenToAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt"); doTest(fileName); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithShadowedVar.kt") public void testSimpleWhenWithShadowedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithUnmatchedAssignments.kt") public void testSimpleWhenWithUnmatchedAssignments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithoutTerminatingAssignment.kt") public void testSimpleWhenWithoutTerminatingAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt"); doTest(fileName); } } @@ -701,24 +701,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class WhenToReturn extends AbstractIntentionTest { public void testAllFilesPresentInWhenToReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt"); doTest(fileName); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt"); doTest(fileName); } } @@ -730,209 +730,209 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class IfThenToDoubleBang extends AbstractIntentionTest { @TestMetadata("acceptableEmptyElseBlockForStatement.kt") public void testAcceptableEmptyElseBlockForStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyElseBlockForStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyElseBlockForStatement.kt"); doTest(fileName); } @TestMetadata("acceptableEmptyThenBlockForStatement.kt") public void testAcceptableEmptyThenBlockForStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyThenBlockForStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyThenBlockForStatement.kt"); doTest(fileName); } @TestMetadata("acceptableWithoutElseBlockForStatementWithFun.kt") public void testAcceptableWithoutElseBlockForStatementWithFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithFun.kt"); doTest(fileName); } @TestMetadata("acceptableWithoutElseBlockForStatementWithVal.kt") public void testAcceptableWithoutElseBlockForStatementWithVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithVal.kt"); doTest(fileName); } public void testAllFilesPresentInIfThenToDoubleBang() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToDoubleBang"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToDoubleBang"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("blockHasMoreThanOneStatement.kt") public void testBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("blockUsesDifferentVar.kt") public void testBlockUsesDifferentVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockUsesDifferentVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockUsesDifferentVar.kt"); doTest(fileName); } @TestMetadata("conditionComparesNullWithNull.kt") public void testConditionComparesNullWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionComparesNullWithNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionComparesNullWithNull.kt"); doTest(fileName); } @TestMetadata("conditionInvalidBinaryExp.kt") public void testConditionInvalidBinaryExp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionInvalidBinaryExp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionInvalidBinaryExp.kt"); doTest(fileName); } @TestMetadata("conditionNotBinaryExpr.kt") public void testConditionNotBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt") public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueIfUsedMoreThanOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueIfUsedMoreThanOnce.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueOutsideOfScope.kt") public void testDoesNotinlineValueOutsideOfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueOutsideOfScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueOutsideOfScope.kt"); doTest(fileName); } @TestMetadata("emptyCondition.kt") public void testEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyCondition.kt"); doTest(fileName); } @TestMetadata("emptyElseBlock.kt") public void testEmptyElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyElseBlock.kt"); doTest(fileName); } @TestMetadata("emptyThenBlock.kt") public void testEmptyThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyThenBlock.kt"); doTest(fileName); } @TestMetadata("ifAndElseBothInBlocks.kt") public void testIfAndElseBothInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseBothInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseBothInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAndElseNotInBlocks.kt") public void testIfAndElseNotInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseNotInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseNotInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAsExpression.kt") public void testIfAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAsExpression.kt"); doTest(fileName); } @TestMetadata("lhsEqualsNull.kt") public void testLhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("lhsNotEqualsNull.kt") public void testLhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("missingElseClause.kt") public void testMissingElseClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingElseClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingElseClause.kt"); doTest(fileName); } @TestMetadata("missingThenClause.kt") public void testMissingThenClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingThenClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingThenClause.kt"); doTest(fileName); } @TestMetadata("noCondition.kt") public void testNoCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noCondition.kt"); doTest(fileName); } @TestMetadata("noNullInCondition.kt") public void testNoNullInCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noNullInCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noNullInCondition.kt"); doTest(fileName); } @TestMetadata("notApplicableForFunction.kt") public void testNotApplicableForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForFunction.kt"); doTest(fileName); } @TestMetadata("notApplicableForLocalVar.kt") public void testNotApplicableForLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForLocalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForLocalVar.kt"); doTest(fileName); } @TestMetadata("nullBranchAlsoNull.kt") public void testNullBranchAlsoNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/nullBranchAlsoNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/nullBranchAlsoNull.kt"); doTest(fileName); } @TestMetadata("otherBlockHasMoreThanOneStatement.kt") public void testOtherBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/otherBlockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/otherBlockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("rhsEqualsNull.kt") public void testRhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("rhsNotEqualsNull.kt") public void testRhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("thenAndElseBothNull.kt") public void testThenAndElseBothNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/thenAndElseBothNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/thenAndElseBothNull.kt"); doTest(fileName); } @TestMetadata("throwByFqName.kt") public void testThrowByFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/throwByFqName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/throwByFqName.kt"); doTest(fileName); } @TestMetadata("unacceptableEmptyElseBlockForExpression.kt") public void testUnacceptableEmptyElseBlockForExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyElseBlockForExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyElseBlockForExpression.kt"); doTest(fileName); } @TestMetadata("unacceptableEmptyThenBlockForExpression.kt") public void testUnacceptableEmptyThenBlockForExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyThenBlockForExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyThenBlockForExpression.kt"); doTest(fileName); } @TestMetadata("willNotInlineClassProperty.kt") public void testWillNotInlineClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/willNotInlineClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/willNotInlineClassProperty.kt"); doTest(fileName); } } @@ -942,198 +942,198 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfThenToElvis extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToElvis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("blockHasMoreThanOneStatement.kt") public void testBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("blockUsesDifferentVar.kt") public void testBlockUsesDifferentVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt"); doTest(fileName); } @TestMetadata("conditionComparesNullWithNull.kt") public void testConditionComparesNullWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt"); doTest(fileName); } @TestMetadata("conditionInvalidBinaryExp.kt") public void testConditionInvalidBinaryExp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt"); doTest(fileName); } @TestMetadata("conditionNotBinaryExpr.kt") public void testConditionNotBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt"); doTest(fileName); } @TestMetadata("doesNotInlineVariableInMultiDeclaration.kt") public void testDoesNotInlineVariableInMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotInlineVariableInMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotInlineVariableInMultiDeclaration.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt") public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueOutsideOfScope.kt") public void testDoesNotinlineValueOutsideOfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt"); doTest(fileName); } @TestMetadata("emptyCondition.kt") public void testEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt"); doTest(fileName); } @TestMetadata("emptyElseBlock.kt") public void testEmptyElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt"); doTest(fileName); } @TestMetadata("emptyThenBlock.kt") public void testEmptyThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt"); doTest(fileName); } @TestMetadata("ifAndElseBothInBlocks.kt") public void testIfAndElseBothInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAndElseNotInBlocks.kt") public void testIfAndElseNotInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAsExpression.kt") public void testIfAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt"); doTest(fileName); } @TestMetadata("ifAsPartOfExpression.kt") public void testIfAsPartOfExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt"); doTest(fileName); } @TestMetadata("lhsEqualsNull.kt") public void testLhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("lhsNotEqualsNull.kt") public void testLhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("missingElseClause.kt") public void testMissingElseClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt"); doTest(fileName); } @TestMetadata("missingThenClause.kt") public void testMissingThenClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt"); doTest(fileName); } @TestMetadata("noCondition.kt") public void testNoCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noCondition.kt"); doTest(fileName); } @TestMetadata("noNullInCondition.kt") public void testNoNullInCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt"); doTest(fileName); } @TestMetadata("notApplicableForFunction.kt") public void testNotApplicableForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt"); doTest(fileName); } @TestMetadata("notApplicableForLocalVar.kt") public void testNotApplicableForLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalVar.kt"); doTest(fileName); } @TestMetadata("notApplicableForSimpleKotlinNPE.kt") public void testNotApplicableForSimpleKotlinNPE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleKotlinNPE.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleKotlinNPE.kt"); doTest(fileName); } @TestMetadata("notApplicableForSimpleNPE.kt") public void testNotApplicableForSimpleNPE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleNPE.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleNPE.kt"); doTest(fileName); } @TestMetadata("nullBranchAlsoNull.kt") public void testNullBranchAlsoNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt"); doTest(fileName); } @TestMetadata("otherBlockHasMoreThanOneStatement.kt") public void testOtherBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("rhsEqualsNull.kt") public void testRhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("rhsNotEqualsNull.kt") public void testRhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("thenAndElseBothNull.kt") public void testThenAndElseBothNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt"); doTest(fileName); } @TestMetadata("throwsNPEwithArgument.kt") public void testThrowsNPEwithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt"); doTest(fileName); } @TestMetadata("willNotInlineClassProperty.kt") public void testWillNotInlineClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt"); doTest(fileName); } @@ -1144,210 +1144,210 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfThenToSafeAccess extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToSafeAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToSafeAccess"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToSafeAccess"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("blockHasMoreThanOneStatement.kt") public void testBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("blockUsesDifferentVar.kt") public void testBlockUsesDifferentVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt"); doTest(fileName); } @TestMetadata("conditionComparesNullWithNull.kt") public void testConditionComparesNullWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionComparesNullWithNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionComparesNullWithNull.kt"); doTest(fileName); } @TestMetadata("conditionInvalidBinaryExp.kt") public void testConditionInvalidBinaryExp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt"); doTest(fileName); } @TestMetadata("conditionNotBinaryExpr.kt") public void testConditionNotBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt") public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt"); doTest(fileName); } @TestMetadata("doesNotinlineValueOutsideOfScope.kt") public void testDoesNotinlineValueOutsideOfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt"); doTest(fileName); } @TestMetadata("emptyCondition.kt") public void testEmptyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyCondition.kt"); doTest(fileName); } @TestMetadata("emptyElseBlock.kt") public void testEmptyElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt"); doTest(fileName); } @TestMetadata("emptyThenBlock.kt") public void testEmptyThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt"); doTest(fileName); } @TestMetadata("ifAndElseBothInBlocks.kt") public void testIfAndElseBothInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAndElseNotInBlocks.kt") public void testIfAndElseNotInBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt"); doTest(fileName); } @TestMetadata("ifAsExpression.kt") public void testIfAsExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt"); doTest(fileName); } @TestMetadata("lhsEqualsNull.kt") public void testLhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("lhsNotEqualsNull.kt") public void testLhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("missingNecessaryElseClause.kt") public void testMissingNecessaryElseClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt"); doTest(fileName); } @TestMetadata("missingNecessaryThenClause.kt") public void testMissingNecessaryThenClause() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt"); doTest(fileName); } @TestMetadata("noCondition.kt") public void testNoCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt"); doTest(fileName); } @TestMetadata("noElseBlock.kt") public void testNoElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt"); doTest(fileName); } @TestMetadata("noNullInCondition.kt") public void testNoNullInCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt"); doTest(fileName); } @TestMetadata("noNullInCondition2.kt") public void testNoNullInCondition2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt"); doTest(fileName); } @TestMetadata("noThenBlock.kt") public void testNoThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt"); doTest(fileName); } @TestMetadata("notApplicableForFunction.kt") public void testNotApplicableForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForFunction.kt"); doTest(fileName); } @TestMetadata("notApplicableForLocalVar.kt") public void testNotApplicableForLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt"); doTest(fileName); } @TestMetadata("otherBlockHasMoreThanOneStatement.kt") public void testOtherBlockHasMoreThanOneStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt"); doTest(fileName); } @TestMetadata("rhsEqualsNull.kt") public void testRhsEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt"); doTest(fileName); } @TestMetadata("rhsNotEqualsNull.kt") public void testRhsNotEqualsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt"); doTest(fileName); } @TestMetadata("thenAndElseBothNull.kt") public void testThenAndElseBothNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseBothNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseBothNull.kt"); doTest(fileName); } @TestMetadata("thenAndElseNotNull.kt") public void testThenAndElseNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt"); doTest(fileName); } @TestMetadata("unacceptableEmptyElseBlock.kt") public void testUnacceptableEmptyElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.kt"); doTest(fileName); } @TestMetadata("unacceptableEmptyThenBlock.kt") public void testUnacceptableEmptyThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.kt"); doTest(fileName); } @TestMetadata("unacceptableNoElseBlock.kt") public void testUnacceptableNoElseBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.kt"); doTest(fileName); } @TestMetadata("unacceptableNoThenBlock.kt") public void testUnacceptableNoThenBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoThenBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoThenBlock.kt"); doTest(fileName); } @TestMetadata("willNotInlineClassProperty.kt") public void testWillNotInlineClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt"); doTest(fileName); } @@ -1358,7 +1358,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfWhen extends AbstractIntentionTest { public void testAllFilesPresentInIfWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen") @@ -1366,66 +1366,66 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfToWhen extends AbstractIntentionTest { public void testAllFilesPresentInIfToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("ifWithEqualityTests.kt") public void testIfWithEqualityTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt"); doTest(fileName); } @TestMetadata("ifWithIs.kt") public void testIfWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt"); doTest(fileName); } @TestMetadata("ifWithMultiConditions.kt") public void testIfWithMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt"); doTest(fileName); } @TestMetadata("ifWithNegativeIs.kt") public void testIfWithNegativeIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt"); doTest(fileName); } @TestMetadata("ifWithNegativeRangeTests.kt") public void testIfWithNegativeRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt"); doTest(fileName); } @TestMetadata("ifWithRangeTests.kt") public void testIfWithRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt"); doTest(fileName); } @TestMetadata("ifWithRangeTestsAndMultiConditions.kt") public void testIfWithRangeTestsAndMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt"); doTest(fileName); } @TestMetadata("ifWithRangeTestsAndUnparenthesizedMultiConditions.kt") public void testIfWithRangeTestsAndUnparenthesizedMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt"); doTest(fileName); } @TestMetadata("ifWithoutElse.kt") public void testIfWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt"); doTest(fileName); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt"); doTest(fileName); } } @@ -1435,84 +1435,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class WhenToIf extends AbstractIntentionTest { public void testAllFilesPresentInWhenToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("whenWithDotQualifiedExpression.kt") public void testWhenWithDotQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt"); doTest(fileName); } @TestMetadata("whenWithMultiConditions.kt") public void testWhenWithMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt"); doTest(fileName); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt"); doTest(fileName); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt"); doTest(fileName); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt"); doTest(fileName); } @TestMetadata("whenWithoutElse.kt") public void testWhenWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt"); doTest(fileName); } @TestMetadata("whenWithoutSubject.kt") public void testWhenWithoutSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt"); doTest(fileName); } @TestMetadata("wrongIsAndInNoEnd.kt") public void testWrongIsAndInNoEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoEnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoEnd.kt"); doTest(fileName); } @TestMetadata("wrongIsAndInNoSubject.kt") public void testWrongIsAndInNoSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt"); doTest(fileName); } } @@ -1523,138 +1523,138 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SafeAccessToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInSafeAccessToIfThen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/safeAccessToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/safeAccessToIfThen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("binaryExpressionLhs.kt") public void testBinaryExpressionLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt"); doTest(fileName); } @TestMetadata("callExpression.kt") public void testCallExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt"); doTest(fileName); } @TestMetadata("callExpressionParens.kt") public void testCallExpressionParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt"); doTest(fileName); } @TestMetadata("customGetterAsReceiver.kt") public void testCustomGetterAsReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt"); doTest(fileName); } @TestMetadata("localValAsReceiver.kt") public void testLocalValAsReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt"); doTest(fileName); } @TestMetadata("localValLhs.kt") public void testLocalValLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt"); doTest(fileName); } @TestMetadata("localVarLhs.kt") public void testLocalVarLhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt"); doTest(fileName); } @TestMetadata("resultAssignedToLocalVal.kt") public void testResultAssignedToLocalVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt"); doTest(fileName); } @TestMetadata("safeAccessAsFunctionArgument.kt") public void testSafeAccessAsFunctionArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt"); doTest(fileName); } @TestMetadata("simpleNameExpression.kt") public void testSimpleNameExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt"); doTest(fileName); } @TestMetadata("simpleNameExpressionInParens.kt") public void testSimpleNameExpressionInParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt"); doTest(fileName); } @TestMetadata("simplePropertyAsReceiver.kt") public void testSimplePropertyAsReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt"); doTest(fileName); } @TestMetadata("simplePropertyAsReceiver2.kt") public void testSimplePropertyAsReceiver2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt"); doTest(fileName); } @TestMetadata("simplePropertyAsReceiver3.kt") public void testSimplePropertyAsReceiver3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt"); doTest(fileName); } @TestMetadata("topLevelVal.kt") public void testTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt"); doTest(fileName); } @TestMetadata("topLevelValCustomGetter.kt") public void testTopLevelValCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt"); doTest(fileName); } @TestMetadata("topLevelVar.kt") public void testTopLevelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt"); doTest(fileName); } @TestMetadata("topLevelVarCustomGetter.kt") public void testTopLevelVarCustomGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt"); doTest(fileName); } @TestMetadata("usedAsFunctionRhs.kt") public void testUsedAsFunctionRhs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt"); doTest(fileName); } @TestMetadata("usedAsResultOfCheckedIf.kt") public void testUsedAsResultOfCheckedIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt"); doTest(fileName); } @TestMetadata("usedAsReturnValue.kt") public void testUsedAsReturnValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt"); doTest(fileName); } @TestMetadata("usedInUncheckedIfExpression.kt") public void testUsedInUncheckedIfExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt"); doTest(fileName); } } @@ -1664,7 +1664,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unfolding extends AbstractIntentionTest { public void testAllFilesPresentInUnfolding() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf") @@ -1672,48 +1672,48 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AssignmentToIf extends AbstractIntentionTest { public void testAllFilesPresentInAssignmentToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt"); doTest(fileName); } @TestMetadata("nestedIfs.kt") public void testNestedIfs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt"); doTest(fileName); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIfWithAugmentedAssignment.kt") public void testSimpleIfWithAugmentedAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleIfWithComplexAssignmentLHS.kt") public void testSimpleIfWithComplexAssignmentLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt"); doTest(fileName); } @TestMetadata("simpleIfWithoutAssignment.kt") public void testSimpleIfWithoutAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt"); doTest(fileName); } } @@ -1723,30 +1723,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class AssignmentToWhen extends AbstractIntentionTest { public void testAllFilesPresentInAssignmentToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt"); doTest(fileName); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithComplexAssignmentLHS.kt") public void testSimpleWhenWithComplexAssignmentLHS() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt"); doTest(fileName); } } @@ -1756,60 +1756,60 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class PropertyToIf extends AbstractIntentionTest { public void testAllFilesPresentInPropertyToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("nestedIfs.kt") public void testNestedIfs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt"); doTest(fileName); } @TestMetadata("nestedIfs2.kt") public void testNestedIfs2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt"); doTest(fileName); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt"); doTest(fileName); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt"); doTest(fileName); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIf2.kt") public void testSimpleIf2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks2.kt") public void testSimpleIfWithBlocks2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt"); doTest(fileName); } @TestMetadata("simpleIfWithType.kt") public void testSimpleIfWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt"); doTest(fileName); } } @@ -1819,48 +1819,48 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class PropertyToWhen extends AbstractIntentionTest { public void testAllFilesPresentInPropertyToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt"); doTest(fileName); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt"); doTest(fileName); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt"); doTest(fileName); } @TestMetadata("simpleWhen2.kt") public void testSimpleWhen2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks2.kt") public void testSimpleWhenWithBlocks2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithType.kt") public void testSimpleWhenWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt"); doTest(fileName); } } @@ -1870,24 +1870,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReturnToIf extends AbstractIntentionTest { public void testAllFilesPresentInReturnToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerIfTransformed.kt") public void testInnerIfTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt"); doTest(fileName); } @TestMetadata("simpleIf.kt") public void testSimpleIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt"); doTest(fileName); } @TestMetadata("simpleIfWithBlocks.kt") public void testSimpleIfWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt"); doTest(fileName); } } @@ -1897,24 +1897,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReturnToWhen extends AbstractIntentionTest { public void testAllFilesPresentInReturnToWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("innerWhenTransformed.kt") public void testInnerWhenTransformed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt"); doTest(fileName); } @TestMetadata("simpleWhen.kt") public void testSimpleWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt"); doTest(fileName); } @TestMetadata("simpleWhenWithBlocks.kt") public void testSimpleWhenWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt"); doTest(fileName); } } @@ -1925,7 +1925,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractIntentionTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/branched/when/eliminateSubject") @@ -1933,54 +1933,54 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class EliminateSubject extends AbstractIntentionTest { public void testAllFilesPresentInEliminateSubject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt"); doTest(fileName); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt"); doTest(fileName); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt"); doTest(fileName); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt"); doTest(fileName); } @TestMetadata("whenWithoutSubject.kt") public void testWhenWithoutSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt"); doTest(fileName); } } @@ -1990,24 +1990,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Flatten extends AbstractIntentionTest { public void testAllFilesPresentInFlatten() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("flattenWithSubject.kt") public void testFlattenWithSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt"); doTest(fileName); } @TestMetadata("flattenWithUnmatchedSubjects.kt") public void testFlattenWithUnmatchedSubjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt"); doTest(fileName); } @TestMetadata("flattenWithoutSubject.kt") public void testFlattenWithoutSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt"); doTest(fileName); } } @@ -2017,72 +2017,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IntroduceSubject extends AbstractIntentionTest { public void testAllFilesPresentInIntroduceSubject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("whenWithEqualityTests.kt") public void testWhenWithEqualityTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt"); doTest(fileName); } @TestMetadata("whenWithMultipleConditionTypes.kt") public void testWhenWithMultipleConditionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt"); doTest(fileName); } @TestMetadata("whenWithNegativePatterns.kt") public void testWhenWithNegativePatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt"); doTest(fileName); } @TestMetadata("whenWithNegativeRangeTests.kt") public void testWhenWithNegativeRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithNondivisibleConditions.kt") public void testWhenWithNondivisibleConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt"); doTest(fileName); } @TestMetadata("whenWithPatterns.kt") public void testWhenWithPatterns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTests.kt") public void testWhenWithRangeTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt"); doTest(fileName); } @TestMetadata("whenWithRangeTestsAndMultiConditions.kt") public void testWhenWithRangeTestsAndMultiConditions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt"); doTest(fileName); } @TestMetadata("whenWithSubject.kt") public void testWhenWithSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt"); doTest(fileName); } @TestMetadata("whenWithSwappedEqualityTests.kt") public void testWhenWithSwappedEqualityTests() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt"); doTest(fileName); } @TestMetadata("whenWithUnmatchedCandidateSubjects.kt") public void testWhenWithUnmatchedCandidateSubjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt"); doTest(fileName); } } @@ -2092,114 +2092,114 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Merge extends AbstractIntentionTest { public void testAllFilesPresentInMerge() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("mergeBlockWithBlock.kt") public void testMergeBlockWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt"); doTest(fileName); } @TestMetadata("mergeBlockWithSingle.kt") public void testMergeBlockWithSingle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt"); doTest(fileName); } @TestMetadata("mergeWithConflictingDeclarations.kt") public void testMergeWithConflictingDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt"); doTest(fileName); } @TestMetadata("mergeWithDeclarations.kt") public void testMergeWithDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt"); doTest(fileName); } @TestMetadata("mergeWithReturnAfter.kt") public void testMergeWithReturnAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt"); doTest(fileName); } @TestMetadata("mergeWithReturnBefore.kt") public void testMergeWithReturnBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt"); doTest(fileName); } @TestMetadata("mergeWithSubject.kt") public void testMergeWithSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithSubject.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions1.kt") public void testMergeWithUnmatchedConditions1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions2.kt") public void testMergeWithUnmatchedConditions2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions3.kt") public void testMergeWithUnmatchedConditions3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions4.kt") public void testMergeWithUnmatchedConditions4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions5.kt") public void testMergeWithUnmatchedConditions5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions6.kt") public void testMergeWithUnmatchedConditions6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedConditions7.kt") public void testMergeWithUnmatchedConditions7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedSubjects1.kt") public void testMergeWithUnmatchedSubjects1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt"); doTest(fileName); } @TestMetadata("mergeWithUnmatchedSubjects2.kt") public void testMergeWithUnmatchedSubjects2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt"); doTest(fileName); } @TestMetadata("mergeWithVarSubject.kt") public void testMergeWithVarSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt"); doTest(fileName); } @TestMetadata("mergeWithoutSubject.kt") public void testMergeWithoutSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt"); doTest(fileName); } } @@ -2211,7 +2211,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ChangeVisibility extends AbstractIntentionTest { public void testAllFilesPresentInChangeVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/changeVisibility/internal") @@ -2219,18 +2219,18 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Internal extends AbstractIntentionTest { public void testAllFilesPresentInInternal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/internal"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/internal"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/simple.kt"); doTest(fileName); } @TestMetadata("valParameter.kt") public void testValParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/valParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/internal/valParameter.kt"); doTest(fileName); } } @@ -2240,84 +2240,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Private extends AbstractIntentionTest { public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/private"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("noModifierListClass.kt") public void testNoModifierListClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListClass.kt"); doTest(fileName); } @TestMetadata("noModifierListFun.kt") public void testNoModifierListFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListFun.kt"); doTest(fileName); } @TestMetadata("noModifierListInterface.kt") public void testNoModifierListInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListInterface.kt"); doTest(fileName); } @TestMetadata("noModifierListObject.kt") public void testNoModifierListObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListObject.kt"); doTest(fileName); } @TestMetadata("noModifierListPrimaryConstructor.kt") public void testNoModifierListPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListPrimaryConstructor.kt"); doTest(fileName); } @TestMetadata("noModifierListSecondaryConstructor.kt") public void testNoModifierListSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListSecondaryConstructor.kt"); doTest(fileName); } @TestMetadata("noModifierListVal.kt") public void testNoModifierListVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListVal.kt"); doTest(fileName); } @TestMetadata("noModifierListValParam.kt") public void testNoModifierListValParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/noModifierListValParam.kt"); doTest(fileName); } @TestMetadata("notForAbstract.kt") public void testNotForAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForAbstract.kt"); doTest(fileName); } @TestMetadata("notForLocal.kt") public void testNotForLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForLocal.kt"); doTest(fileName); } @TestMetadata("notForParameter.kt") public void testNotForParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/notForParameter.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/simple.kt"); doTest(fileName); } @TestMetadata("withAnnotations.kt") public void testWithAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/withAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/private/withAnnotations.kt"); doTest(fileName); } } @@ -2327,42 +2327,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Protected extends AbstractIntentionTest { public void testAllFilesPresentInProtected() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/protected"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/protected"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("caretAfter.kt") public void testCaretAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/caretAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/caretAfter.kt"); doTest(fileName); } @TestMetadata("noModifier.kt") public void testNoModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/noModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/noModifier.kt"); doTest(fileName); } @TestMetadata("notForObjectMember.kt") public void testNotForObjectMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForObjectMember.kt"); doTest(fileName); } @TestMetadata("notForOverride.kt") public void testNotForOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForOverride.kt"); doTest(fileName); } @TestMetadata("notForTopLevel.kt") public void testNotForTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/notForTopLevel.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/protected/simple.kt"); doTest(fileName); } } @@ -2372,36 +2372,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Public extends AbstractIntentionTest { public void testAllFilesPresentInPublic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/public"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/changeVisibility/public"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("alreadyPublic.kt") public void testAlreadyPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/alreadyPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/alreadyPublic.kt"); doTest(fileName); } @TestMetadata("primaryConstructor.kt") public void testPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructor.kt"); doTest(fileName); } @TestMetadata("primaryConstructorPublicByDefault.kt") public void testPrimaryConstructorPublicByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/primaryConstructorPublicByDefault.kt"); doTest(fileName); } @TestMetadata("publicByDefault.kt") public void testPublicByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/publicByDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/publicByDefault.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/changeVisibility/public/simple.kt"); doTest(fileName); } } @@ -2412,7 +2412,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConventionNameCalls extends AbstractIntentionTest { public void testAllFilesPresentInConventionNameCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator") @@ -2421,119 +2421,119 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ReplaceCallWithBinaryOperator extends AbstractIntentionTest { @TestMetadata("acceptableVararg1.kt") public void testAcceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg1.kt"); doTest(fileName); } @TestMetadata("acceptableVararg2.kt") public void testAcceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/acceptableVararg2.kt"); doTest(fileName); } public void testAllFilesPresentInReplaceCallWithBinaryOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("allowableDefaultArgument.kt") public void testAllowableDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/allowableDefaultArgument.kt"); doTest(fileName); } @TestMetadata("divSanityTest.kt") public void testDivSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/divSanityTest.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("minusSanityTest.kt") public void testMinusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/minusSanityTest.kt"); doTest(fileName); } @TestMetadata("missingDefaultArgument.kt") public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/missingDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/missingDefaultArgument.kt"); doTest(fileName); } @TestMetadata("modSanityTest.kt") public void testModSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/modSanityTest.kt"); doTest(fileName); } @TestMetadata("multipleArguments.kt") public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/multipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/multipleArguments.kt"); doTest(fileName); } @TestMetadata("plusSanityTest.kt") public void testPlusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/plusSanityTest.kt"); doTest(fileName); } @TestMetadata("qualifier.kt") public void testQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/qualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/qualifier.kt"); doTest(fileName); } @TestMetadata("rangeToSanityTest.kt") public void testRangeToSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/rangeToSanityTest.kt"); doTest(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/super.kt"); doTest(fileName); } @TestMetadata("timesSanityTest.kt") public void testTimesSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/timesSanityTest.kt"); doTest(fileName); } @TestMetadata("typeArguments.kt") public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg1.kt") public void testUnacceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg1.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg2.kt") public void testUnacceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/unacceptableVararg2.kt"); doTest(fileName); } @TestMetadata("validNamedArgument.kt") public void testValidNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/validNamedArgument.kt"); doTest(fileName); } } @@ -2544,95 +2544,95 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ReplaceCallWithUnaryOperator extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/acceptableVararg.kt"); doTest(fileName); } public void testAllFilesPresentInReplaceCallWithUnaryOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexPlus.kt") public void testComplexPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/complexPlus.kt"); doTest(fileName); } @TestMetadata("defaultArgument.kt") public void testDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/defaultArgument.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("minusSanityTest.kt") public void testMinusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/minusSanityTest.kt"); doTest(fileName); } @TestMetadata("namedValueArgument.kt") public void testNamedValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/namedValueArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/namedValueArgument.kt"); doTest(fileName); } @TestMetadata("notSanityTest.kt") public void testNotSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/notSanityTest.kt"); doTest(fileName); } @TestMetadata("plusPlus.kt") public void testPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusPlus.kt"); doTest(fileName); } @TestMetadata("plusSanityTest.kt") public void testPlusSanityTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/plusSanityTest.kt"); doTest(fileName); } @TestMetadata("qualifier.kt") public void testQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/qualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/qualifier.kt"); doTest(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/super.kt"); doTest(fileName); } @TestMetadata("typeArguments.kt") public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/typeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/typeArguments.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg.kt") public void testUnacceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/unacceptableVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/unacceptableVararg.kt"); doTest(fileName); } @TestMetadata("valueArgument.kt") public void testValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/valueArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceCallWithUnaryOperator/valueArgument.kt"); doTest(fileName); } } @@ -2643,131 +2643,131 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ReplaceContains extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg.kt"); doTest(fileName); } @TestMetadata("acceptableVararg2.kt") public void testAcceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/acceptableVararg2.kt"); doTest(fileName); } public void testAllFilesPresentInReplaceContains() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceContains"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceContains"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("allowableDefaultArgument.kt") public void testAllowableDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/allowableDefaultArgument.kt"); doTest(fileName); } @TestMetadata("containsInExpression.kt") public void testContainsInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgumentAfterSemicolon.kt") public void testFunctionLiteralArgumentAfterSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAfterSemicolon.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgumentAtStartOfBlock.kt") public void testFunctionLiteralArgumentAtStartOfBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentAtStartOfBlock.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgumentInExpression.kt") public void testFunctionLiteralArgumentInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt"); doTest(fileName); } @TestMetadata("invalidArgument.kt") public void testInvalidArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt"); doTest(fileName); } @TestMetadata("missingArgument.kt") public void testMissingArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt"); doTest(fileName); } @TestMetadata("missingDefaultArgument.kt") public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/missingDefaultArgument.kt"); doTest(fileName); } @TestMetadata("multipleArguments.kt") public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/multipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/multipleArguments.kt"); doTest(fileName); } @TestMetadata("notContains.kt") public void testNotContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt"); doTest(fileName); } @TestMetadata("qualifier.kt") public void testQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/qualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/qualifier.kt"); doTest(fileName); } @TestMetadata("simpleArgument.kt") public void testSimpleArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt"); doTest(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/super.kt"); doTest(fileName); } @TestMetadata("typeArguments.kt") public void testTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg1.kt") public void testUnacceptableVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg1.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg2.kt") public void testUnacceptableVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/unacceptableVararg2.kt"); doTest(fileName); } @TestMetadata("validNamedArgument.kt") public void testValidNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/validNamedArgument.kt"); doTest(fileName); } } @@ -2778,143 +2778,143 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ReplaceGetOrSet extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/acceptableVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/acceptableVararg.kt"); doTest(fileName); } public void testAllFilesPresentInReplaceGetOrSet() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceGetOrSet"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceGetOrSet"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("argumentAndFunction.kt") public void testArgumentAndFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/argumentAndFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/argumentAndFunction.kt"); doTest(fileName); } @TestMetadata("duplicateArguments.kt") public void testDuplicateArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/duplicateArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/duplicateArguments.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionalArgument.kt") public void testFunctionalArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/functionalArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/functionalArgument.kt"); doTest(fileName); } @TestMetadata("invalidArgument.kt") public void testInvalidArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/invalidArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/invalidArgument.kt"); doTest(fileName); } @TestMetadata("missingDefaultArgument.kt") public void testMissingDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/missingDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/missingDefaultArgument.kt"); doTest(fileName); } @TestMetadata("multiArgument.kt") public void testMultiArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/multiArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/multiArgument.kt"); doTest(fileName); } @TestMetadata("noArgument.kt") public void testNoArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/noArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/noArgument.kt"); doTest(fileName); } @TestMetadata("notOperator.kt") public void testNotOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/notOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/notOperator.kt"); doTest(fileName); } @TestMetadata("qualifier.kt") public void testQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/qualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/qualifier.kt"); doTest(fileName); } @TestMetadata("sanityCheck.kt") public void testSanityCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/sanityCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/sanityCheck.kt"); doTest(fileName); } @TestMetadata("set.kt") public void testSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/set.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/set.kt"); doTest(fileName); } @TestMetadata("set2.kt") public void testSet2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/set2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/set2.kt"); doTest(fileName); } @TestMetadata("setValueUsed.kt") public void testSetValueUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setValueUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setValueUsed.kt"); doTest(fileName); } @TestMetadata("setWithNoParameters.kt") public void testSetWithNoParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setWithNoParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setWithNoParameters.kt"); doTest(fileName); } @TestMetadata("setWithVararg.kt") public void testSetWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/setWithVararg.kt"); doTest(fileName); } @TestMetadata("singleArgument.kt") public void testSingleArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/singleArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/singleArgument.kt"); doTest(fileName); } @TestMetadata("staticMethod.kt") public void testStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/staticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/staticMethod.kt"); doTest(fileName); } @TestMetadata("super.kt") public void testSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/super.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/super.kt"); doTest(fileName); } @TestMetadata("topLevelFun.kt") public void testTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/topLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/topLevelFun.kt"); doTest(fileName); } @TestMetadata("unacceptableVararg.kt") public void testUnacceptableVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/unacceptableVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/unacceptableVararg.kt"); doTest(fileName); } @TestMetadata("unnamedAndNamed.kt") public void testUnnamedAndNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/unnamedAndNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/unnamedAndNamed.kt"); doTest(fileName); } @@ -2925,72 +2925,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceInvoke extends AbstractIntentionTest { public void testAllFilesPresentInReplaceInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceInvoke"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/conventionNameCalls/replaceInvoke"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("expressionReceiver.kt") public void testExpressionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/expressionReceiver.kt"); doTest(fileName); } @TestMetadata("extensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/extensionFunction.kt"); doTest(fileName); } @TestMetadata("functionLiteralInvoke.kt") public void testFunctionLiteralInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/functionLiteralInvoke.kt"); doTest(fileName); } @TestMetadata("invokeInExpression.kt") public void testInvokeInExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt"); doTest(fileName); } @TestMetadata("namedArgumentInvoke.kt") public void testNamedArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/namedArgumentInvoke.kt"); doTest(fileName); } @TestMetadata("noArgumentInvoke.kt") public void testNoArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/noArgumentInvoke.kt"); doTest(fileName); } @TestMetadata("typeAndValueArgument.kt") public void testTypeAndValueArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt"); doTest(fileName); } @TestMetadata("typeArgumentAndFunctionLiteral.kt") public void testTypeArgumentAndFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("valueAndFunctionLiteralInvoke.kt") public void testValueAndFunctionLiteralInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueAndFunctionLiteralInvoke.kt"); doTest(fileName); } @TestMetadata("valueArgumentInvoke.kt") public void testValueArgumentInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/valueArgumentInvoke.kt"); doTest(fileName); } @TestMetadata("varargInvoke.kt") public void testVarargInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke/varargInvoke.kt"); doTest(fileName); } } @@ -3001,120 +3001,120 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertAssertToIf extends AbstractIntentionTest { public void testAllFilesPresentInConvertAssertToIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertAssertToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertAssertToIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assertErrorOverloaded.kt") public void testAssertErrorOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt"); doTest(fileName); } @TestMetadata("booleanCondition.kt") public void testBooleanCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanCondition.kt"); doTest(fileName); } @TestMetadata("booleanConditionSimplified.kt") public void testBooleanConditionSimplified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified.kt"); doTest(fileName); } @TestMetadata("booleanConditionSimplified2.kt") public void testBooleanConditionSimplified2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified2.kt"); doTest(fileName); } @TestMetadata("booleanConditionWithVariables.kt") public void testBooleanConditionWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionWithVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionWithVariables.kt"); doTest(fileName); } @TestMetadata("doNotShortenReferenceInsideMessage.kt") public void testDoNotShortenReferenceInsideMessage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/doNotShortenReferenceInsideMessage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/doNotShortenReferenceInsideMessage.kt"); doTest(fileName); } @TestMetadata("dotQualifiedCall.kt") public void testDotQualifiedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt"); doTest(fileName); } @TestMetadata("functionCallCondition.kt") public void testFunctionCallCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionCallCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionCallCondition.kt"); doTest(fileName); } @TestMetadata("functionMessageInsideParentheses.kt") public void testFunctionMessageInsideParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionMessageInsideParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionMessageInsideParentheses.kt"); doTest(fileName); } @TestMetadata("inapplicableAssertOverloaded.kt") public void testInapplicableAssertOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloaded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloaded.kt"); doTest(fileName); } @TestMetadata("inapplicableAssertOverloadedWithPackage.kt") public void testInapplicableAssertOverloadedWithPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloadedWithPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloadedWithPackage.kt"); doTest(fileName); } @TestMetadata("inapplicableNoCondition.kt") public void testInapplicableNoCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt"); doTest(fileName); } @TestMetadata("lambdaMessageInsideParentheses.kt") public void testLambdaMessageInsideParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageInsideParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageInsideParentheses.kt"); doTest(fileName); } @TestMetadata("lambdaMessageOutsideParentheses.kt") public void testLambdaMessageOutsideParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageOutsideParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageOutsideParentheses.kt"); doTest(fileName); } @TestMetadata("lambdaVariable.kt") public void testLambdaVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaVariable.kt"); doTest(fileName); } @TestMetadata("noMessage.kt") public void testNoMessage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/noMessage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/noMessage.kt"); doTest(fileName); } @TestMetadata("parenthesizedCondition.kt") public void testParenthesizedCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/parenthesizedCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/parenthesizedCondition.kt"); doTest(fileName); } @TestMetadata("simpleConvert.kt") public void testSimpleConvert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/simpleConvert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/simpleConvert.kt"); doTest(fileName); } @TestMetadata("stringVariable.kt") public void testStringVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/stringVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/stringVariable.kt"); doTest(fileName); } } @@ -3124,78 +3124,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertForEachToForLoop extends AbstractIntentionTest { public void testAllFilesPresentInConvertForEachToForLoop() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertForEachToForLoop"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertForEachToForLoop"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexReceiver.kt") public void testComplexReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/complexReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/complexReceiver.kt"); doTest(fileName); } @TestMetadata("explicitFunctionLiteral.kt") public void testExplicitFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/explicitFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/explicitFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("extraArguments.kt") public void testExtraArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/extraArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/extraArguments.kt"); doTest(fileName); } @TestMetadata("implicitFunctionLiteralParameter.kt") public void testImplicitFunctionLiteralParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/implicitFunctionLiteralParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/implicitFunctionLiteralParameter.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/infixCall.kt"); doTest(fileName); } @TestMetadata("infixCallNotAvailable.kt") public void testInfixCallNotAvailable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/infixCallNotAvailable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/infixCallNotAvailable.kt"); doTest(fileName); } @TestMetadata("keepComments.kt") public void testKeepComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/keepComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/keepComments.kt"); doTest(fileName); } @TestMetadata("parenthesizedExpression.kt") public void testParenthesizedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/parenthesizedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/parenthesizedExpression.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/simple.kt"); doTest(fileName); } @TestMetadata("typeArgumentPresent.kt") public void testTypeArgumentPresent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/typeArgumentPresent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/typeArgumentPresent.kt"); doTest(fileName); } @TestMetadata("userDefined.kt") public void testUserDefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/userDefined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/userDefined.kt"); doTest(fileName); } @TestMetadata("zeroArguments.kt") public void testZeroArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/zeroArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertForEachToForLoop/zeroArguments.kt"); doTest(fileName); } } @@ -3206,155 +3206,155 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ConvertFunctionToProperty extends AbstractIntentionTest { @TestMetadata("addExplicitAnonymousType.kt") public void testAddExplicitAnonymousType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitAnonymousType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitAnonymousType.kt"); doTest(fileName); } @TestMetadata("addExplicitLocalType.kt") public void testAddExplicitLocalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitLocalType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitLocalType.kt"); doTest(fileName); } @TestMetadata("addExplicitType.kt") public void testAddExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/addExplicitType.kt"); doTest(fileName); } public void testAllFilesPresentInConvertFunctionToProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertFunctionToProperty"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertFunctionToProperty"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("blockBody.kt") public void testBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/blockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/blockBody.kt"); doTest(fileName); } @TestMetadata("existingPropertyConflict.kt") public void testExistingPropertyConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/existingPropertyConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/existingPropertyConflict.kt"); doTest(fileName); } @TestMetadata("existingPropertyJavaConflict.kt") public void testExistingPropertyJavaConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/existingPropertyJavaConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/existingPropertyJavaConflict.kt"); doTest(fileName); } @TestMetadata("expressionBody.kt") public void testExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/expressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/expressionBody.kt"); doTest(fileName); } @TestMetadata("extraArgumentsConflict.kt") public void testExtraArgumentsConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt"); doTest(fileName); } @TestMetadata("funWithParameters.kt") public void testFunWithParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/funWithParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/funWithParameters.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/invoke.kt"); doTest(fileName); } @TestMetadata("iterator.kt") public void testIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/iterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/iterator.kt"); doTest(fileName); } @TestMetadata("javaUsages.kt") public void testJavaUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsages.kt"); doTest(fileName); } @TestMetadata("javaUsagesGet.kt") public void testJavaUsagesGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsagesGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsagesGet.kt"); doTest(fileName); } @TestMetadata("javaUsagesIs.kt") public void testJavaUsagesIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsagesIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/javaUsagesIs.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/localFun.kt"); doTest(fileName); } @TestMetadata("nothingFun.kt") public void testNothingFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/nothingFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/nothingFun.kt"); doTest(fileName); } @TestMetadata("otherRefs.kt") public void testOtherRefs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefs.kt"); doTest(fileName); } @TestMetadata("otherRefsGet.kt") public void testOtherRefsGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefsGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefsGet.kt"); doTest(fileName); } @TestMetadata("otherRefsIs.kt") public void testOtherRefsIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefsIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/otherRefsIs.kt"); doTest(fileName); } @TestMetadata("overrides.kt") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/overrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/overrides.kt"); doTest(fileName); } @TestMetadata("recursiveFunction.kt") public void testRecursiveFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/recursiveFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/recursiveFunction.kt"); doTest(fileName); } @TestMetadata("typeArgumentsConflict.kt") public void testTypeArgumentsConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt"); doTest(fileName); } @TestMetadata("unaryOp.kt") public void testUnaryOp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unaryOp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unaryOp.kt"); doTest(fileName); } @TestMetadata("unchangedElements.kt") public void testUnchangedElements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unchangedElements.kt"); doTest(fileName); } @TestMetadata("unitFun.kt") public void testUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertFunctionToProperty/unitFun.kt"); doTest(fileName); } } @@ -3364,84 +3364,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertIfWithThrowToAssert extends AbstractIntentionTest { public void testAllFilesPresentInConvertIfWithThrowToAssert() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfWithThrowToAssert"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfWithThrowToAssert"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assertOverloaded.kt") public void testAssertOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded.kt"); doTest(fileName); } @TestMetadata("assertOverloaded2.kt") public void testAssertOverloaded2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/assertOverloaded2.kt"); doTest(fileName); } @TestMetadata("booleanCondition.kt") public void testBooleanCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/booleanCondition.kt"); doTest(fileName); } @TestMetadata("dotQualifiedThrow.kt") public void testDotQualifiedThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/dotQualifiedThrow.kt"); doTest(fileName); } @TestMetadata("inapplicableAssertionErrorOverloaded.kt") public void testInapplicableAssertionErrorOverloaded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableAssertionErrorOverloaded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableAssertionErrorOverloaded.kt"); doTest(fileName); } @TestMetadata("inapplicableCauseSent.kt") public void testInapplicableCauseSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableCauseSent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableCauseSent.kt"); doTest(fileName); } @TestMetadata("inapplicableHasElse.kt") public void testInapplicableHasElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableHasElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableHasElse.kt"); doTest(fileName); } @TestMetadata("inapplicableMoreThanSingleExpression.kt") public void testInapplicableMoreThanSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression.kt"); doTest(fileName); } @TestMetadata("inapplicableMoreThanSingleExpression2.kt") public void testInapplicableMoreThanSingleExpression2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/inapplicableMoreThanSingleExpression2.kt"); doTest(fileName); } @TestMetadata("noMessageSent.kt") public void testNoMessageSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/noMessageSent.kt"); doTest(fileName); } @TestMetadata("nullSent.kt") public void testNullSent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/nullSent.kt"); doTest(fileName); } @TestMetadata("simpleConvert.kt") public void testSimpleConvert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simpleConvert.kt"); doTest(fileName); } @TestMetadata("simplifiedCondition.kt") public void testSimplifiedCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertIfWithThrowToAssert/simplifiedCondition.kt"); doTest(fileName); } } @@ -3451,66 +3451,66 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertNegatedBooleanSequence extends AbstractIntentionTest { public void testAllFilesPresentInConvertNegatedBooleanSequence() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedBooleanSequence"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedBooleanSequence"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexNegatedSequence.kt") public void testComplexNegatedSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/complexNegatedSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/complexNegatedSequence.kt"); doTest(fileName); } @TestMetadata("conjunctionOfThreeNegations.kt") public void testConjunctionOfThreeNegations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfThreeNegations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfThreeNegations.kt"); doTest(fileName); } @TestMetadata("conjunctionOfTwoNegations.kt") public void testConjunctionOfTwoNegations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfTwoNegations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfTwoNegations.kt"); doTest(fileName); } @TestMetadata("disjunctionOfTwoNegations.kt") public void testDisjunctionOfTwoNegations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/disjunctionOfTwoNegations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/disjunctionOfTwoNegations.kt"); doTest(fileName); } @TestMetadata("doubleParenthesizedExpression.kt") public void testDoubleParenthesizedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/doubleParenthesizedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/doubleParenthesizedExpression.kt"); doTest(fileName); } @TestMetadata("inapplicableMixedOperators.kt") public void testInapplicableMixedOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedOperators.kt"); doTest(fileName); } @TestMetadata("inapplicableMixedSequence.kt") public void testInapplicableMixedSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedSequence.kt"); doTest(fileName); } @TestMetadata("inapplicableSingleExpression.kt") public void testInapplicableSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableSingleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableSingleExpression.kt"); doTest(fileName); } @TestMetadata("negatedFunction.kt") public void testNegatedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/negatedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/negatedFunction.kt"); doTest(fileName); } @TestMetadata("parenthesizedConjunctionOfTwoNegations.kt") public void testParenthesizedConjunctionOfTwoNegations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/parenthesizedConjunctionOfTwoNegations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/parenthesizedConjunctionOfTwoNegations.kt"); doTest(fileName); } } @@ -3520,96 +3520,96 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertNegatedExpressionWithDemorgansLaw extends AbstractIntentionTest { public void testAllFilesPresentInConvertNegatedExpressionWithDemorgansLaw() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexNegation1.kt") public void testComplexNegation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation1.kt"); doTest(fileName); } @TestMetadata("complexNegation2.kt") public void testComplexNegation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation2.kt"); doTest(fileName); } @TestMetadata("conjunctionNegation1.kt") public void testConjunctionNegation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation1.kt"); doTest(fileName); } @TestMetadata("conjunctionNegation2.kt") public void testConjunctionNegation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation2.kt"); doTest(fileName); } @TestMetadata("disjunctionNegation1.kt") public void testDisjunctionNegation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation1.kt"); doTest(fileName); } @TestMetadata("disjunctionNegation2.kt") public void testDisjunctionNegation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation2.kt"); doTest(fileName); } @TestMetadata("dontAddRedundantParenthesis.kt") public void testDontAddRedundantParenthesis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/dontAddRedundantParenthesis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/dontAddRedundantParenthesis.kt"); doTest(fileName); } @TestMetadata("doubleNegation.kt") public void testDoubleNegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/doubleNegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/doubleNegation.kt"); doTest(fileName); } @TestMetadata("inapplicableNormalExpression.kt") public void testInapplicableNormalExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableNormalExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableNormalExpression.kt"); doTest(fileName); } @TestMetadata("inapplicableOperator.kt") public void testInapplicableOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt"); doTest(fileName); } @TestMetadata("inapplicableTriple.kt") public void testInapplicableTriple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableTriple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableTriple.kt"); doTest(fileName); } @TestMetadata("longMixedExpression.kt") public void testLongMixedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/longMixedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/longMixedExpression.kt"); doTest(fileName); } @TestMetadata("mixedExpression.kt") public void testMixedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/mixedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/mixedExpression.kt"); doTest(fileName); } @TestMetadata("nonstandardPrefixOperator.kt") public void testNonstandardPrefixOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/nonstandardPrefixOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/nonstandardPrefixOperator.kt"); doTest(fileName); } @TestMetadata("retainedParens.kt") public void testRetainedParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/retainedParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/retainedParens.kt"); doTest(fileName); } } @@ -3619,78 +3619,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertParameterToReceiver extends AbstractIntentionTest { public void testAllFilesPresentInConvertParameterToReceiver() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertParameterToReceiver"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertParameterToReceiver"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("classParameter.kt") public void testClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/classParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/classParameter.kt"); doTest(fileName); } @TestMetadata("functionExpression.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/functionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/functionExpression.kt"); doTest(fileName); } @TestMetadata("functionExpressionWithThisConflict.kt") public void testFunctionExpressionWithThisConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/functionExpressionWithThisConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/functionExpressionWithThisConflict.kt"); doTest(fileName); } @TestMetadata("lambdaParameter.kt") public void testLambdaParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/lambdaParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/lambdaParameter.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localFun.kt"); doTest(fileName); } @TestMetadata("localObject.kt") public void testLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localObject.kt"); doTest(fileName); } @TestMetadata("localObjectWithFunctionNameConflict.kt") public void testLocalObjectWithFunctionNameConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localObjectWithFunctionNameConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/localObjectWithFunctionNameConflict.kt"); doTest(fileName); } @TestMetadata("memberFun.kt") public void testMemberFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/memberFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/memberFun.kt"); doTest(fileName); } @TestMetadata("noParameterUnderCaret.kt") public void testNoParameterUnderCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/noParameterUnderCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/noParameterUnderCaret.kt"); doTest(fileName); } @TestMetadata("topLevelFun.kt") public void testTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/topLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/topLevelFun.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/vararg.kt"); doTest(fileName); } @TestMetadata("withExtensionReceiver.kt") public void testWithExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/withExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertParameterToReceiver/withExtensionReceiver.kt"); doTest(fileName); } } @@ -3701,95 +3701,95 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ConvertPropertyToFunction extends AbstractIntentionTest { @TestMetadata("accessorCallGroovy.kt") public void testAccessorCallGroovy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/accessorCallGroovy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/accessorCallGroovy.kt"); doTest(fileName); } public void testAllFilesPresentInConvertPropertyToFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertPropertyToFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertPropertyToFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("blockBody.kt") public void testBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/blockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/blockBody.kt"); doTest(fileName); } @TestMetadata("delegatingProperty.kt") public void testDelegatingProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/delegatingProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/delegatingProperty.kt"); doTest(fileName); } @TestMetadata("existingFunConflict.kt") public void testExistingFunConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/existingFunConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/existingFunConflict.kt"); doTest(fileName); } @TestMetadata("existingFunJavaConflict.kt") public void testExistingFunJavaConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/existingFunJavaConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/existingFunJavaConflict.kt"); doTest(fileName); } @TestMetadata("expressionBody.kt") public void testExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/expressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/expressionBody.kt"); doTest(fileName); } @TestMetadata("initializer.kt") public void testInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/initializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/initializer.kt"); doTest(fileName); } @TestMetadata("javaUsageAsField.kt") public void testJavaUsageAsField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/javaUsageAsField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/javaUsageAsField.kt"); doTest(fileName); } @TestMetadata("javaUsages.kt") public void testJavaUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/javaUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/javaUsages.kt"); doTest(fileName); } @TestMetadata("otherRefs.kt") public void testOtherRefs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/otherRefs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/otherRefs.kt"); doTest(fileName); } @TestMetadata("overrides.kt") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/overrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/overrides.kt"); doTest(fileName); } @TestMetadata("propertyCallGroovy.kt") public void testPropertyCallGroovy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/propertyCallGroovy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/propertyCallGroovy.kt"); doTest(fileName); } @TestMetadata("recursiveAccessor.kt") public void testRecursiveAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/recursiveAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/recursiveAccessor.kt"); doTest(fileName); } @TestMetadata("unchangedElements.kt") public void testUnchangedElements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/unchangedElements.kt"); doTest(fileName); } @TestMetadata("var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertPropertyToFunction/var.kt"); doTest(fileName); } } @@ -3799,48 +3799,48 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertReceiverToParameter extends AbstractIntentionTest { public void testAllFilesPresentInConvertReceiverToParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertReceiverToParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertReceiverToParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("functionExpression.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/functionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/functionExpression.kt"); doTest(fileName); } @TestMetadata("genericReceiver.kt") public void testGenericReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/genericReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/genericReceiver.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/localFun.kt"); doTest(fileName); } @TestMetadata("memberFun.kt") public void testMemberFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/memberFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/memberFun.kt"); doTest(fileName); } @TestMetadata("noReceiverUnderCaret.kt") public void testNoReceiverUnderCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/noReceiverUnderCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/noReceiverUnderCaret.kt"); doTest(fileName); } @TestMetadata("notExtension.kt") public void testNotExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/notExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/notExtension.kt"); doTest(fileName); } @TestMetadata("topLevelFun.kt") public void testTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/topLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertReceiverToParameter/topLevelFun.kt"); doTest(fileName); } } @@ -3851,125 +3851,125 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ConvertToBlockBody extends AbstractIntentionTest { @TestMetadata("addSpace.kt") public void testAddSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/addSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/addSpace.kt"); doTest(fileName); } public void testAllFilesPresentInConvertToBlockBody() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotatedExpr.kt") public void testAnnotatedExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/annotatedExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/annotatedExpr.kt"); doTest(fileName); } @TestMetadata("explicitlyNonUnitFun.kt") public void testExplicitlyNonUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt"); doTest(fileName); } @TestMetadata("explicitlyTypedFunWithUnresolvedExpression.kt") public void testExplicitlyTypedFunWithUnresolvedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt"); doTest(fileName); } @TestMetadata("explicitlyTypedFunWithUnresolvedType.kt") public void testExplicitlyTypedFunWithUnresolvedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt"); doTest(fileName); } @TestMetadata("explicitlyUnitFun.kt") public void testExplicitlyUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt"); doTest(fileName); } @TestMetadata("explicitlyUnitFunWithUnresolvedExpression.kt") public void testExplicitlyUnitFunWithUnresolvedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt"); doTest(fileName); } @TestMetadata("funWithThrow.kt") public void testFunWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/funWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/funWithThrow.kt"); doTest(fileName); } @TestMetadata("getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getter.kt"); doTest(fileName); } @TestMetadata("getterWithThrow.kt") public void testGetterWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getterWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getterWithThrow.kt"); doTest(fileName); } @TestMetadata("implicitlyNonUnitFun.kt") public void testImplicitlyNonUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt"); doTest(fileName); } @TestMetadata("implicitlyTypedFunWithUnresolvedType.kt") public void testImplicitlyTypedFunWithUnresolvedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyTypedFunWithUnresolvedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyTypedFunWithUnresolvedType.kt"); doTest(fileName); } @TestMetadata("implicitlyUnitFun.kt") public void testImplicitlyUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt"); doTest(fileName); } @TestMetadata("labeledExpr.kt") public void testLabeledExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/labeledExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/labeledExpr.kt"); doTest(fileName); } @TestMetadata("nothingFun.kt") public void testNothingFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/nothingFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/nothingFun.kt"); doTest(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/setter.kt"); doTest(fileName); } @TestMetadata("valueIsAnonymousObject.kt") public void testValueIsAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject.kt"); doTest(fileName); } @TestMetadata("valueIsAnonymousObject2.kt") public void testValueIsAnonymousObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject2.kt"); doTest(fileName); } @TestMetadata("valueIsAnonymousObject3.kt") public void testValueIsAnonymousObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt"); doTest(fileName); } @TestMetadata("valueIsAnonymousObject4.kt") public void testValueIsAnonymousObject4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/valueIsAnonymousObject4.kt"); doTest(fileName); } } @@ -3979,156 +3979,156 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertToConcatenatedString extends AbstractIntentionTest { public void testAllFilesPresentInConvertToConcatenatedString() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToConcatenatedString"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToConcatenatedString"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("embeddedIf.kt") public void testEmbeddedIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/embeddedIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/embeddedIf.kt"); doTest(fileName); } @TestMetadata("embeddedIfBraces.kt") public void testEmbeddedIfBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/embeddedIfBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/embeddedIfBraces.kt"); doTest(fileName); } @TestMetadata("emptyBraces.kt") public void testEmptyBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/emptyBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/emptyBraces.kt"); doTest(fileName); } @TestMetadata("handlesEscapeString.kt") public void testHandlesEscapeString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/handlesEscapeString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/handlesEscapeString.kt"); doTest(fileName); } @TestMetadata("interpolate2StringConstants.kt") public void testInterpolate2StringConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolate2StringConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolate2StringConstants.kt"); doTest(fileName); } @TestMetadata("interpolate3.kt") public void testInterpolate3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolate3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolate3.kt"); doTest(fileName); } @TestMetadata("interpolateChar.kt") public void testInterpolateChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateChar.kt"); doTest(fileName); } @TestMetadata("interpolateConstants.kt") public void testInterpolateConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateConstants.kt"); doTest(fileName); } @TestMetadata("interpolateMapAccess.kt") public void testInterpolateMapAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateMapAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateMapAccess.kt"); doTest(fileName); } @TestMetadata("interpolateMethodInvoke.kt") public void testInterpolateMethodInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateMethodInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateMethodInvoke.kt"); doTest(fileName); } @TestMetadata("interpolateSimpleWithBraces.kt") public void testInterpolateSimpleWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateSimpleWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateSimpleWithBraces.kt"); doTest(fileName); } @TestMetadata("interpolateStringWithFloat.kt") public void testInterpolateStringWithFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateStringWithFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateStringWithFloat.kt"); doTest(fileName); } @TestMetadata("interpolateStringWithInt.kt") public void testInterpolateStringWithInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateStringWithInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/interpolateStringWithInt.kt"); doTest(fileName); } @TestMetadata("lastExprIsNamedExpression.kt") public void testLastExprIsNamedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/lastExprIsNamedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/lastExprIsNamedExpression.kt"); doTest(fileName); } @TestMetadata("multilineString.kt") public void testMultilineString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/multilineString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/multilineString.kt"); doTest(fileName); } @TestMetadata("multilineWhenExpr.kt") public void testMultilineWhenExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/multilineWhenExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/multilineWhenExpr.kt"); doTest(fileName); } @TestMetadata("namedExprBetweenConstants.kt") public void testNamedExprBetweenConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/namedExprBetweenConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/namedExprBetweenConstants.kt"); doTest(fileName); } @TestMetadata("notApplicableForErrorElement.kt") public void testNotApplicableForErrorElement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notApplicableForErrorElement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notApplicableForErrorElement.kt"); doTest(fileName); } @TestMetadata("notApplicableForSimple.kt") public void testNotApplicableForSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notApplicableForSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notApplicableForSimple.kt"); doTest(fileName); } @TestMetadata("notAvailableForDollarSignLiteral.kt") public void testNotAvailableForDollarSignLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notAvailableForDollarSignLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/notAvailableForDollarSignLiteral.kt"); doTest(fileName); } @TestMetadata("singleVar.kt") public void testSingleVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/singleVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/singleVar.kt"); doTest(fileName); } @TestMetadata("startsWithInt.kt") public void testStartsWithInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/startsWithInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/startsWithInt.kt"); doTest(fileName); } @TestMetadata("startsWithStringExpression.kt") public void testStartsWithStringExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/startsWithStringExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/startsWithStringExpression.kt"); doTest(fileName); } @TestMetadata("tricky.kt") public void testTricky() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/tricky.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/tricky.kt"); doTest(fileName); } @TestMetadata("withAndWithoutBraces.kt") public void testWithAndWithoutBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/withAndWithoutBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedString/withAndWithoutBraces.kt"); doTest(fileName); } } @@ -4138,138 +4138,138 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertToExpressionBody extends AbstractIntentionTest { public void testAllFilesPresentInConvertToExpressionBody() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("anonymousObjectExpression.kt") public void testAnonymousObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt"); doTest(fileName); } @TestMetadata("assignPlus.kt") public void testAssignPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/assignPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/assignPlus.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/assignment.kt"); doTest(fileName); } @TestMetadata("declaration.kt") public void testDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/declaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/declaration.kt"); doTest(fileName); } @TestMetadata("emptyList.kt") public void testEmptyList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/emptyList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/emptyList.kt"); doTest(fileName); } @TestMetadata("expressionWithReturns1.kt") public void testExpressionWithReturns1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns1.kt"); doTest(fileName); } @TestMetadata("expressionWithReturns2.kt") public void testExpressionWithReturns2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns2.kt"); doTest(fileName); } @TestMetadata("funWithImplicitUnitTypeWithThrow.kt") public void testFunWithImplicitUnitTypeWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt"); doTest(fileName); } @TestMetadata("funWithNoBlock.kt") public void testFunWithNoBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNoBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNoBlock.kt"); doTest(fileName); } @TestMetadata("funWithNothingType.kt") public void testFunWithNothingType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt"); doTest(fileName); } @TestMetadata("funWithReturn.kt") public void testFunWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithReturn.kt"); doTest(fileName); } @TestMetadata("funWithUnitType.kt") public void testFunWithUnitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt"); doTest(fileName); } @TestMetadata("funWithUnitType2.kt") public void testFunWithUnitType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType2.kt"); doTest(fileName); } @TestMetadata("funWithUnitTypeWithThrow.kt") public void testFunWithUnitTypeWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt"); doTest(fileName); } @TestMetadata("functionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/functionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/functionLiteral.kt"); doTest(fileName); } @TestMetadata("getWithReturn.kt") public void testGetWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/getWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/getWithReturn.kt"); doTest(fileName); } @TestMetadata("multipleStatements.kt") public void testMultipleStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/multipleStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/multipleStatements.kt"); doTest(fileName); } @TestMetadata("overridePublicFun.kt") public void testOverridePublicFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/overridePublicFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/overridePublicFun.kt"); doTest(fileName); } @TestMetadata("returnFromLambda.kt") public void testReturnFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnFromLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnFromLambda.kt"); doTest(fileName); } @TestMetadata("returnFromLambda2.kt") public void testReturnFromLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnFromLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnFromLambda2.kt"); doTest(fileName); } @TestMetadata("returnWithNoValue.kt") public void testReturnWithNoValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnWithNoValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnWithNoValue.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/while.kt"); doTest(fileName); } @@ -4279,30 +4279,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class KeepComments extends AbstractIntentionTest { @TestMetadata("1.kt") public void test1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/1.kt"); doTest(fileName); } @TestMetadata("2.kt") public void test2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/2.kt"); doTest(fileName); } @TestMetadata("3.kt") public void test3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/3.kt"); doTest(fileName); } @TestMetadata("4.kt") public void test4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/keepComments/4.kt"); doTest(fileName); } public void testAllFilesPresentInKeepComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } } } @@ -4312,72 +4312,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertToForEachFunctionCall extends AbstractIntentionTest { public void testAllFilesPresentInConvertToForEachFunctionCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachFunctionCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachFunctionCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("binaryExpressionLoopRange.kt") public void testBinaryExpressionLoopRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/binaryExpressionLoopRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/binaryExpressionLoopRange.kt"); doTest(fileName); } @TestMetadata("blockBodyExpression.kt") public void testBlockBodyExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/blockBodyExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/blockBodyExpression.kt"); doTest(fileName); } @TestMetadata("commentsInBody.kt") public void testCommentsInBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsInBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsInBody.kt"); doTest(fileName); } @TestMetadata("commentsInBody2.kt") public void testCommentsInBody2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsInBody2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsInBody2.kt"); doTest(fileName); } @TestMetadata("commentsOutsideBody.kt") public void testCommentsOutsideBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsOutsideBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/commentsOutsideBody.kt"); doTest(fileName); } @TestMetadata("emptyBody.kt") public void testEmptyBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/emptyBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/emptyBody.kt"); doTest(fileName); } @TestMetadata("iterativeElementTypeSpecified.kt") public void testIterativeElementTypeSpecified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/iterativeElementTypeSpecified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/iterativeElementTypeSpecified.kt"); doTest(fileName); } @TestMetadata("noCurlyBraces.kt") public void testNoCurlyBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noCurlyBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noCurlyBraces.kt"); doTest(fileName); } @TestMetadata("noStatements.kt") public void testNoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noStatements.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/simple.kt"); doTest(fileName); } @TestMetadata("typeAnnotatedWithNonBlockBody.kt") public void testTypeAnnotatedWithNonBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/typeAnnotatedWithNonBlockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/typeAnnotatedWithNonBlockBody.kt"); doTest(fileName); } } @@ -4387,168 +4387,168 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertToStringTemplate extends AbstractIntentionTest { public void testAllFilesPresentInConvertToStringTemplate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToStringTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToStringTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("backslashNMultilineString.kt") public void testBackslashNMultilineString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/backslashNMultilineString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/backslashNMultilineString.kt"); doTest(fileName); } @TestMetadata("combineEmptyStrings.kt") public void testCombineEmptyStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combineEmptyStrings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combineEmptyStrings.kt"); doTest(fileName); } @TestMetadata("combinesNonStringsAsStrings.kt") public void testCombinesNonStringsAsStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combinesNonStringsAsStrings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combinesNonStringsAsStrings.kt"); doTest(fileName); } @TestMetadata("combinesNonStringsAsStrings2.kt") public void testCombinesNonStringsAsStrings2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combinesNonStringsAsStrings2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/combinesNonStringsAsStrings2.kt"); doTest(fileName); } @TestMetadata("consecutiveNewlines.kt") public void testConsecutiveNewlines() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/consecutiveNewlines.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/consecutiveNewlines.kt"); doTest(fileName); } @TestMetadata("doesNotCorruptExistingTemplate.kt") public void testDoesNotCorruptExistingTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/doesNotCorruptExistingTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/doesNotCorruptExistingTemplate.kt"); doTest(fileName); } @TestMetadata("doesNotCorruptExistingTemplateWithBraces.kt") public void testDoesNotCorruptExistingTemplateWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/doesNotCorruptExistingTemplateWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/doesNotCorruptExistingTemplateWithBraces.kt"); doTest(fileName); } @TestMetadata("insertBracesForSimpleNamedExpression.kt") public void testInsertBracesForSimpleNamedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/insertBracesForSimpleNamedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/insertBracesForSimpleNamedExpression.kt"); doTest(fileName); } @TestMetadata("interpolate2StringConstants.kt") public void testInterpolate2StringConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate2StringConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate2StringConstants.kt"); doTest(fileName); } @TestMetadata("interpolate2Vals.kt") public void testInterpolate2Vals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate2Vals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate2Vals.kt"); doTest(fileName); } @TestMetadata("interpolate3Left.kt") public void testInterpolate3Left() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate3Left.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate3Left.kt"); doTest(fileName); } @TestMetadata("interpolate3Right.kt") public void testInterpolate3Right() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate3Right.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolate3Right.kt"); doTest(fileName); } @TestMetadata("interpolateChar.kt") public void testInterpolateChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateChar.kt"); doTest(fileName); } @TestMetadata("interpolateDollarSign.kt") public void testInterpolateDollarSign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateDollarSign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateDollarSign.kt"); doTest(fileName); } @TestMetadata("interpolateMapAccess.kt") public void testInterpolateMapAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMapAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMapAccess.kt"); doTest(fileName); } @TestMetadata("interpolateMethodInvoke.kt") public void testInterpolateMethodInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMethodInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMethodInvoke.kt"); doTest(fileName); } @TestMetadata("interpolateMultiline.kt") public void testInterpolateMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMultiline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateMultiline.kt"); doTest(fileName); } @TestMetadata("interpolateStringWithFloat.kt") public void testInterpolateStringWithFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateStringWithFloat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateStringWithFloat.kt"); doTest(fileName); } @TestMetadata("interpolateStringWithInt.kt") public void testInterpolateStringWithInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateStringWithInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/interpolateStringWithInt.kt"); doTest(fileName); } @TestMetadata("multilineString.kt") public void testMultilineString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/multilineString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/multilineString.kt"); doTest(fileName); } @TestMetadata("noBracesForLastSimpleExpression.kt") public void testNoBracesForLastSimpleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/noBracesForLastSimpleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/noBracesForLastSimpleExpression.kt"); doTest(fileName); } @TestMetadata("noBracesSimpleFollowedByDot.kt") public void testNoBracesSimpleFollowedByDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/noBracesSimpleFollowedByDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/noBracesSimpleFollowedByDot.kt"); doTest(fileName); } @TestMetadata("notApplicableForErrorElement.kt") public void testNotApplicableForErrorElement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/notApplicableForErrorElement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/notApplicableForErrorElement.kt"); doTest(fileName); } @TestMetadata("onlyForConcat.kt") public void testOnlyForConcat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/onlyForConcat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/onlyForConcat.kt"); doTest(fileName); } @TestMetadata("onlyForStrings.kt") public void testOnlyForStrings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/onlyForStrings.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/onlyForStrings.kt"); doTest(fileName); } @TestMetadata("requiresPlusOperator.kt") public void testRequiresPlusOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/requiresPlusOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/requiresPlusOperator.kt"); doTest(fileName); } @TestMetadata("tricky.kt") public void testTricky() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/tricky.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/tricky.kt"); doTest(fileName); } @@ -4559,7 +4559,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractIntentionTest { public void testAllFilesPresentInDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/intentions/declarations/convertMemberToExtension") @@ -4568,233 +4568,233 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class ConvertMemberToExtension extends AbstractIntentionTest { @TestMetadata("abstract.kt") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt"); doTest(fileName); } @TestMetadata("abstractProperty.kt") public void testAbstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt"); doTest(fileName); } public void testAllFilesPresentInConvertMemberToExtension() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/convertMemberToExtension"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/convertMemberToExtension"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("explicitUnit.kt") public void testExplicitUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/explicitUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/explicitUnit.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/extension.kt"); doTest(fileName); } @TestMetadata("funcitonNoName.kt") public void testFuncitonNoName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/funcitonNoName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/funcitonNoName.kt"); doTest(fileName); } @TestMetadata("functionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt"); doTest(fileName); } @TestMetadata("genericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericClass.kt"); doTest(fileName); } @TestMetadata("genericFun.kt") public void testGenericFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFun.kt"); doTest(fileName); } @TestMetadata("genericFunInGenericClass.kt") public void testGenericFunInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt"); doTest(fileName); } @TestMetadata("genericFunInGenericClassWithUpperBounds.kt") public void testGenericFunInGenericClassWithUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt"); doTest(fileName); } @TestMetadata("genericFunParamAfterName.kt") public void testGenericFunParamAfterName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt"); doTest(fileName); } @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt"); doTest(fileName); } @TestMetadata("inFunctionBody.kt") public void testInFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inFunctionBody.kt"); doTest(fileName); } @TestMetadata("inObject.kt") public void testInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inObject.kt"); doTest(fileName); } @TestMetadata("internal.kt") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/internal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/internal.kt"); doTest(fileName); } @TestMetadata("KDoc.kt") public void testKDoc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/KDoc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/KDoc.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/localFunction.kt"); doTest(fileName); } @TestMetadata("nonBlockBodyNoType.kt") public void testNonBlockBodyNoType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyNoType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyNoType.kt"); doTest(fileName); } @TestMetadata("nonBlockBodyWithType.kt") public void testNonBlockBodyWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyWithType.kt"); doTest(fileName); } @TestMetadata("outsideFunction.kt") public void testOutsideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/outsideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/outsideFunction.kt"); doTest(fileName); } @TestMetadata("override.kt") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/override.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/override.kt"); doTest(fileName); } @TestMetadata("private.kt") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/private.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/private.kt"); doTest(fileName); } @TestMetadata("protected.kt") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/protected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/protected.kt"); doTest(fileName); } @TestMetadata("public.kt") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/public.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/public.kt"); doTest(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/secondaryConstructor.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/simple.kt"); doTest(fileName); } @TestMetadata("topLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/topLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/topLevelFunction.kt"); doTest(fileName); } @TestMetadata("typeFqName.kt") public void testTypeFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt"); doTest(fileName); } @TestMetadata("unknownType.kt") public void testUnknownType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt"); doTest(fileName); } @TestMetadata("valWithDefaultGetter.kt") public void testValWithDefaultGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt"); doTest(fileName); } @TestMetadata("valWithGetter.kt") public void testValWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetter.kt"); doTest(fileName); } @TestMetadata("valWithGetterBlockBody.kt") public void testValWithGetterBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetterBlockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetterBlockBody.kt"); doTest(fileName); } @TestMetadata("varWithDefaultGetterAndSetter.kt") public void testVarWithDefaultGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt"); doTest(fileName); } @TestMetadata("varWithDefaultSetter.kt") public void testVarWithDefaultSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt"); doTest(fileName); } @TestMetadata("varWithGetter.kt") public void testVarWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt"); doTest(fileName); } @TestMetadata("varWithGetterAndSetter.kt") public void testVarWithGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetterAndSetter.kt"); doTest(fileName); } @TestMetadata("varWithSetter.kt") public void testVarWithSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt"); doTest(fileName); } @TestMetadata("withType.kt") public void testWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/withType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/withType.kt"); doTest(fileName); } } @@ -4804,78 +4804,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class Split extends AbstractIntentionTest { public void testAllFilesPresentInSplit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("longInit.kt") public void testLongInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit.kt"); doTest(fileName); } @TestMetadata("longInit2.kt") public void testLongInit2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit2.kt"); doTest(fileName); } @TestMetadata("noInitializer.kt") public void testNoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer.kt"); doTest(fileName); } @TestMetadata("noInitializer2.kt") public void testNoInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer2.kt"); doTest(fileName); } @TestMetadata("nonLocalProperty.kt") public void testNonLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty.kt"); doTest(fileName); } @TestMetadata("nonLocalProperty2.kt") public void testNonLocalProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty2.kt"); doTest(fileName); } @TestMetadata("simpleInit.kt") public void testSimpleInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit.kt"); doTest(fileName); } @TestMetadata("simpleInit2.kt") public void testSimpleInit2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithErrorType.kt") public void testSimpleInitWithErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt"); doTest(fileName); } @TestMetadata("simpleInitWithErrorType2.kt") public void testSimpleInitWithErrorType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithType.kt") public void testSimpleInitWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType.kt"); doTest(fileName); } @TestMetadata("simpleInitWithType2.kt") public void testSimpleInitWithType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType2.kt"); doTest(fileName); } } @@ -4886,126 +4886,126 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedCallableAddReplaceWith extends AbstractIntentionTest { public void testAllFilesPresentInDeprecatedCallableAddReplaceWith() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/deprecatedCallableAddReplaceWith"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/deprecatedCallableAddReplaceWith"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("AlreadyWithReplaceWith.kt") public void testAlreadyWithReplaceWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt"); doTest(fileName); } @TestMetadata("CommentInBody.kt") public void testCommentInBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt"); doTest(fileName); } @TestMetadata("DeclarationInside.kt") public void testDeclarationInside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt"); doTest(fileName); } @TestMetadata("ExpressionBody.kt") public void testExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt"); doTest(fileName); } @TestMetadata("If.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/If.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/If.kt"); doTest(fileName); } @TestMetadata("Imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt"); doTest(fileName); } @TestMetadata("NoCompanionObjectImport.kt") public void testNoCompanionObjectImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt"); doTest(fileName); } @TestMetadata("NoDefaultImport.kt") public void testNoDefaultImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt"); doTest(fileName); } @TestMetadata("NoReturn.kt") public void testNoReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt"); doTest(fileName); } @TestMetadata("NotAvailableOnDocComment.kt") public void testNotAvailableOnDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt"); doTest(fileName); } @TestMetadata("PrivateSymbolUsed.kt") public void testPrivateSymbolUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt"); doTest(fileName); } @TestMetadata("QualifiedCall.kt") public void testQualifiedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt"); doTest(fileName); } @TestMetadata("Return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt"); doTest(fileName); } @TestMetadata("ReturnInside.kt") public void testReturnInside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt"); doTest(fileName); } @TestMetadata("StringLiteral.kt") public void testStringLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt"); doTest(fileName); } @TestMetadata("StringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt"); doTest(fileName); } @TestMetadata("TwoStatements.kt") public void testTwoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt"); doTest(fileName); } @TestMetadata("ValProperty.kt") public void testValProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt"); doTest(fileName); } @TestMetadata("ValPropertyWithReturn.kt") public void testValPropertyWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt"); doTest(fileName); } @@ -5016,84 +5016,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IfNullToElvis extends AbstractIntentionTest { public void testAllFilesPresentInIfNullToElvis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/ifNullToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/ifNullToElvis"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("Break.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Break.kt"); doTest(fileName); } @TestMetadata("CommentInBlock.kt") public void testCommentInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/CommentInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/CommentInBlock.kt"); doTest(fileName); } @TestMetadata("Comments.kt") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments.kt"); doTest(fileName); } @TestMetadata("Comments2.kt") public void testComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Comments2.kt"); doTest(fileName); } @TestMetadata("Continue.kt") public void testContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Continue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Continue.kt"); doTest(fileName); } @TestMetadata("IfNotNull.kt") public void testIfNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/IfNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/IfNotNull.kt"); doTest(fileName); } @TestMetadata("MultiStatementBlock.kt") public void testMultiStatementBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/MultiStatementBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/MultiStatementBlock.kt"); doTest(fileName); } @TestMetadata("NotExit.kt") public void testNotExit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/NotExit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/NotExit.kt"); doTest(fileName); } @TestMetadata("OtherVar1.kt") public void testOtherVar1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar1.kt"); doTest(fileName); } @TestMetadata("OtherVar2.kt") public void testOtherVar2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/OtherVar2.kt"); doTest(fileName); } @TestMetadata("Return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Return.kt"); doTest(fileName); } @TestMetadata("ThrowInBlock.kt") public void testThrowInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/ThrowInBlock.kt"); doTest(fileName); } @TestMetadata("Var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/ifNullToElvis/Var.kt"); doTest(fileName); } } @@ -5103,42 +5103,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class InfixCallToOrdinary extends AbstractIntentionTest { public void testAllFilesPresentInInfixCallToOrdinary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/infixCallToOrdinary"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/infixCallToOrdinary"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("functionCallAfterInfixCall.kt") public void testFunctionCallAfterInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionCallAfterInfixCall.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("nonApplicableBinaryOperation.kt") public void testNonApplicableBinaryOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nonApplicableBinaryOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nonApplicableBinaryOperation.kt"); doTest(fileName); } @TestMetadata("nullAssertedCall.kt") public void testNullAssertedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/nullAssertedCall.kt"); doTest(fileName); } @TestMetadata("parenthesesAroundRightHandArgument.kt") public void testParenthesesAroundRightHandArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/parenthesesAroundRightHandArgument.kt"); doTest(fileName); } @TestMetadata("simpleInfixFunctionCall.kt") public void testSimpleInfixFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/infixCallToOrdinary/simpleInfixFunctionCall.kt"); doTest(fileName); } } @@ -5148,42 +5148,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class InsertCurlyBracesToTemplate extends AbstractIntentionTest { public void testAllFilesPresentInInsertCurlyBracesToTemplate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertCurlyBracesToTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertCurlyBracesToTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("dontInsertBrackets1.kt") public void testDontInsertBrackets1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/dontInsertBrackets1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/dontInsertBrackets1.kt"); doTest(fileName); } @TestMetadata("insertBrackets1.kt") public void testInsertBrackets1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets1.kt"); doTest(fileName); } @TestMetadata("insertBrackets2.kt") public void testInsertBrackets2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets2.kt"); doTest(fileName); } @TestMetadata("insertBrackets3.kt") public void testInsertBrackets3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets3.kt"); doTest(fileName); } @TestMetadata("insertBrackets4.kt") public void testInsertBrackets4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets4.kt"); doTest(fileName); } @TestMetadata("insertBrackets5.kt") public void testInsertBrackets5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets5.kt"); doTest(fileName); } } @@ -5193,120 +5193,120 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class InsertExplicitTypeArguments extends AbstractIntentionTest { public void testAllFilesPresentInInsertExplicitTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertExplicitTypeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertExplicitTypeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inapplicableAlreadyTyped.kt") public void testInapplicableAlreadyTyped() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt"); doTest(fileName); } @TestMetadata("inapplicableNotGeneric.kt") public void testInapplicableNotGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotGeneric.kt"); doTest(fileName); } @TestMetadata("inapplicableNotInCallable.kt") public void testInapplicableNotInCallable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt"); doTest(fileName); } @TestMetadata("inapplicableNotInCallable2.kt") public void testInapplicableNotInCallable2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt"); doTest(fileName); } @TestMetadata("inapplicableTypeNotInferred.kt") public void testInapplicableTypeNotInferred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt"); doTest(fileName); } @TestMetadata("insertImportForArg.kt") public void testInsertImportForArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt"); doTest(fileName); } @TestMetadata("insertManyTypes.kt") public void testInsertManyTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt"); doTest(fileName); } @TestMetadata("insertManyTypesInDifferentOrder.kt") public void testInsertManyTypesInDifferentOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt"); doTest(fileName); } @TestMetadata("insertMultipleSomeWithClashingName.kt") public void testInsertMultipleSomeWithClashingName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt"); doTest(fileName); } @TestMetadata("insertTwoTypesFun.kt") public void testInsertTwoTypesFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt"); doTest(fileName); } @TestMetadata("insertTypeAny.kt") public void testInsertTypeAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeAny.kt"); doTest(fileName); } @TestMetadata("insertTypeThatIsAFunction.kt") public void testInsertTypeThatIsAFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt"); doTest(fileName); } @TestMetadata("insertTypeThatIsATypeArg.kt") public void testInsertTypeThatIsATypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt"); doTest(fileName); } @TestMetadata("insertTypeWithClashingName.kt") public void testInsertTypeWithClashingName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt"); doTest(fileName); } @TestMetadata("insertTypeWithLambda.kt") public void testInsertTypeWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt"); doTest(fileName); } @TestMetadata("insertTypeWithTypeArguments.kt") public void testInsertTypeWithTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithTypeArguments.kt"); doTest(fileName); } @TestMetadata("insertTypeWithVarargs.kt") public void testInsertTypeWithVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt"); doTest(fileName); } @TestMetadata("simpleInsertTypeClass.kt") public void testSimpleInsertTypeClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeClass.kt"); doTest(fileName); } @TestMetadata("simpleInsertTypeFun.kt") public void testSimpleInsertTypeFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt"); doTest(fileName); } } @@ -5316,60 +5316,60 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IntroduceBackingProperty extends AbstractIntentionTest { public void testAllFilesPresentInIntroduceBackingProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/introduceBackingProperty"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/introduceBackingProperty"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("backingFieldRef.kt") public void testBackingFieldRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt"); doTest(fileName); } @TestMetadata("inapplicableAbstractProperty.kt") public void testInapplicableAbstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/inapplicableAbstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/inapplicableAbstractProperty.kt"); doTest(fileName); } @TestMetadata("inapplicableNoBackingField.kt") public void testInapplicableNoBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/inapplicableNoBackingField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/inapplicableNoBackingField.kt"); doTest(fileName); } @TestMetadata("semicolon.kt") public void testSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/semicolon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/semicolon.kt"); doTest(fileName); } @TestMetadata("simpleVal.kt") public void testSimpleVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleVal.kt"); doTest(fileName); } @TestMetadata("simpleValWithType.kt") public void testSimpleValWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleValWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleValWithType.kt"); doTest(fileName); } @TestMetadata("simpleVar.kt") public void testSimpleVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/simpleVar.kt"); doTest(fileName); } @TestMetadata("valWithAccessor.kt") public void testValWithAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/valWithAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/valWithAccessor.kt"); doTest(fileName); } @TestMetadata("varWithAccessor.kt") public void testVarWithAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/varWithAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/introduceBackingProperty/varWithAccessor.kt"); doTest(fileName); } } @@ -5379,168 +5379,168 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class InvertIfCondition extends AbstractIntentionTest { public void testAllFilesPresentInInvertIfCondition() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/invertIfCondition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/invertIfCondition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assignedToValue.kt") public void testAssignedToValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/assignedToValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/assignedToValue.kt"); doTest(fileName); } @TestMetadata("binaryExpression.kt") public void testBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/binaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/binaryExpression.kt"); doTest(fileName); } @TestMetadata("booleanLiteral.kt") public void testBooleanLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/booleanLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/booleanLiteral.kt"); doTest(fileName); } @TestMetadata("branchingIfStatements.kt") public void testBranchingIfStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/branchingIfStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/branchingIfStatements.kt"); doTest(fileName); } @TestMetadata("forLoopWithMultipleExpressions.kt") public void testForLoopWithMultipleExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/forLoopWithMultipleExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/forLoopWithMultipleExpressions.kt"); doTest(fileName); } @TestMetadata("functionWithReturnExpression.kt") public void testFunctionWithReturnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/functionWithReturnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/functionWithReturnExpression.kt"); doTest(fileName); } @TestMetadata("ifExpressionInsideForLoop.kt") public void testIfExpressionInsideForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionInsideForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionInsideForLoop.kt"); doTest(fileName); } @TestMetadata("ifExpressionWithReturn.kt") public void testIfExpressionWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionWithReturn.kt"); doTest(fileName); } @TestMetadata("ifThenReturn.kt") public void testIfThenReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn.kt"); doTest(fileName); } @TestMetadata("ifThenReturn2.kt") public void testIfThenReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn2.kt"); doTest(fileName); } @TestMetadata("ifThenReturn3.kt") public void testIfThenReturn3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn3.kt"); doTest(fileName); } @TestMetadata("ifThenReturn4.kt") public void testIfThenReturn4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifThenReturn4.kt"); doTest(fileName); } @TestMetadata("invertableOperator.kt") public void testInvertableOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/invertableOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/invertableOperator.kt"); doTest(fileName); } @TestMetadata("lastStatement1.kt") public void testLastStatement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement1.kt"); doTest(fileName); } @TestMetadata("lastStatement2.kt") public void testLastStatement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement2.kt"); doTest(fileName); } @TestMetadata("lastStatement3.kt") public void testLastStatement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatement3.kt"); doTest(fileName); } @TestMetadata("lastStatementBeforeBreak.kt") public void testLastStatementBeforeBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeBreak.kt"); doTest(fileName); } @TestMetadata("lastStatementBeforeContinue.kt") public void testLastStatementBeforeContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeContinue.kt"); doTest(fileName); } @TestMetadata("lastStatementBeforeReturn.kt") public void testLastStatementBeforeReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementBeforeReturn.kt"); doTest(fileName); } @TestMetadata("lastStatementInLambda.kt") public void testLastStatementInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLambda.kt"); doTest(fileName); } @TestMetadata("lastStatementInLoop.kt") public void testLastStatementInLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLoop.kt"); doTest(fileName); } @TestMetadata("lastStatementInLoop2.kt") public void testLastStatementInLoop2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLoop2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementInLoop2.kt"); doTest(fileName); } @TestMetadata("lastStatementNonUnitMethod.kt") public void testLastStatementNonUnitMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementNonUnitMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/lastStatementNonUnitMethod.kt"); doTest(fileName); } @TestMetadata("negatedExpression.kt") public void testNegatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/negatedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/negatedExpression.kt"); doTest(fileName); } @TestMetadata("returnIfExpression.kt") public void testReturnIfExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/returnIfExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/returnIfExpression.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/simple.kt"); doTest(fileName); } @TestMetadata("valueAndReturnBranches.kt") public void testValueAndReturnBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/valueAndReturnBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/valueAndReturnBranches.kt"); doTest(fileName); } } @@ -5550,30 +5550,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class IterateExpression extends AbstractIntentionTest { public void testAllFilesPresentInIterateExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/iterateExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/iterateExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("functionCall.kt") public void testFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/functionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/functionCall.kt"); doTest(fileName); } @TestMetadata("nameSuggestion.kt") public void testNameSuggestion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/nameSuggestion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/nameSuggestion.kt"); doTest(fileName); } @TestMetadata("noNameConflict.kt") public void testNoNameConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/noNameConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/noNameConflict.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterateExpression/simple.kt"); doTest(fileName); } } @@ -5583,48 +5583,48 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class MoveAssignmentToInitializer extends AbstractIntentionTest { public void testAllFilesPresentInMoveAssignmentToInitializer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveAssignmentToInitializer"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveAssignmentToInitializer"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("cannotRemoveType.kt") public void testCannotRemoveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType.kt"); doTest(fileName); } @TestMetadata("cannotRemoveType2.kt") public void testCannotRemoveType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType2.kt"); doTest(fileName); } @TestMetadata("cannotRemoveType3.kt") public void testCannotRemoveType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/cannotRemoveType3.kt"); doTest(fileName); } @TestMetadata("comment.kt") public void testComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/comment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/comment.kt"); doTest(fileName); } @TestMetadata("deleteInitBlock.kt") public void testDeleteInitBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/deleteInitBlock.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/simple.kt"); doTest(fileName); } @TestMetadata("usedLocal.kt") public void testUsedLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/usedLocal.kt"); doTest(fileName); } } @@ -5634,102 +5634,102 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class MoveLambdaInsideParentheses extends AbstractIntentionTest { public void testAllFilesPresentInMoveLambdaInsideParentheses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaInsideParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaInsideParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inapplicable1.kt") public void testInapplicable1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable1.kt"); doTest(fileName); } @TestMetadata("inapplicable2.kt") public void testInapplicable2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt"); doTest(fileName); } @TestMetadata("moveLabeledLambda1.kt") public void testMoveLabeledLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt"); doTest(fileName); } @TestMetadata("moveLabeledLambda2.kt") public void testMoveLabeledLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt"); doTest(fileName); } @TestMetadata("moveLambda1.kt") public void testMoveLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt"); doTest(fileName); } @TestMetadata("moveLambda10.kt") public void testMoveLambda10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt"); doTest(fileName); } @TestMetadata("moveLambda11.kt") public void testMoveLambda11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt"); doTest(fileName); } @TestMetadata("moveLambda12.kt") public void testMoveLambda12() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt"); doTest(fileName); } @TestMetadata("moveLambda2.kt") public void testMoveLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda2.kt"); doTest(fileName); } @TestMetadata("moveLambda3.kt") public void testMoveLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda3.kt"); doTest(fileName); } @TestMetadata("moveLambda4.kt") public void testMoveLambda4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda4.kt"); doTest(fileName); } @TestMetadata("moveLambda5.kt") public void testMoveLambda5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda5.kt"); doTest(fileName); } @TestMetadata("moveLambda6.kt") public void testMoveLambda6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda6.kt"); doTest(fileName); } @TestMetadata("moveLambda7.kt") public void testMoveLambda7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda7.kt"); doTest(fileName); } @TestMetadata("moveLambda8.kt") public void testMoveLambda8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda8.kt"); doTest(fileName); } @TestMetadata("moveLambda9.kt") public void testMoveLambda9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda9.kt"); doTest(fileName); } } @@ -5739,108 +5739,108 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class MoveLambdaOutsideParentheses extends AbstractIntentionTest { public void testAllFilesPresentInMoveLambdaOutsideParentheses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaOutsideParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaOutsideParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("ambigousOverload.kt") public void testAmbigousOverload() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt"); doTest(fileName); } @TestMetadata("functionalValueCall.kt") public void testFunctionalValueCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/functionalValueCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/functionalValueCall.kt"); doTest(fileName); } @TestMetadata("inapplicable1.kt") public void testInapplicable1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable1.kt"); doTest(fileName); } @TestMetadata("inapplicable2.kt") public void testInapplicable2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt"); doTest(fileName); } @TestMetadata("inapplicable3.kt") public void testInapplicable3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt"); doTest(fileName); } @TestMetadata("inapplicableAlreadyHasFunctionLiteral.kt") public void testInapplicableAlreadyHasFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicableAlreadyHasFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicableAlreadyHasFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("inapplicableOptionalParametersAfter.kt") public void testInapplicableOptionalParametersAfter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicableOptionalParametersAfter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicableOptionalParametersAfter.kt"); doTest(fileName); } @TestMetadata("labeledLambda.kt") public void testLabeledLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt"); doTest(fileName); } @TestMetadata("lambdaWithCommas.kt") public void testLambdaWithCommas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas.kt"); doTest(fileName); } @TestMetadata("lambdaWithCommas2.kt") public void testLambdaWithCommas2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas2.kt"); doTest(fileName); } @TestMetadata("lambdaWithCommas3.kt") public void testLambdaWithCommas3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas3.kt"); doTest(fileName); } @TestMetadata("moveLambda1.kt") public void testMoveLambda1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda1.kt"); doTest(fileName); } @TestMetadata("moveLambda2.kt") public void testMoveLambda2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda2.kt"); doTest(fileName); } @TestMetadata("moveLambda3.kt") public void testMoveLambda3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt"); doTest(fileName); } @TestMetadata("moveLambda4.kt") public void testMoveLambda4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda4.kt"); doTest(fileName); } @TestMetadata("moveLambda5.kt") public void testMoveLambda5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda5.kt"); doTest(fileName); } @TestMetadata("moveLambda6.kt") public void testMoveLambda6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda6.kt"); doTest(fileName); } } @@ -5850,126 +5850,126 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ObjectLiteralToLambda extends AbstractIntentionTest { public void testAllFilesPresentInObjectLiteralToLambda() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/objectLiteralToLambda"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/objectLiteralToLambda"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("EmptyBody.kt") public void testEmptyBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/EmptyBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/EmptyBody.kt"); doTest(fileName); } @TestMetadata("ExpressionBody.kt") public void testExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ExpressionBody.kt"); doTest(fileName); } @TestMetadata("HasData.kt") public void testHasData() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/HasData.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/HasData.kt"); doTest(fileName); } @TestMetadata("MultipleBases.kt") public void testMultipleBases() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/MultipleBases.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/MultipleBases.kt"); doTest(fileName); } @TestMetadata("MultipleParameters.kt") public void testMultipleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/MultipleParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/MultipleParameters.kt"); doTest(fileName); } @TestMetadata("NoSamAdapterNeeded.kt") public void testNoSamAdapterNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NoSamAdapterNeeded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NoSamAdapterNeeded.kt"); doTest(fileName); } @TestMetadata("NotInRange1.kt") public void testNotInRange1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotInRange1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotInRange1.kt"); doTest(fileName); } @TestMetadata("NotInRange2.kt") public void testNotInRange2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotInRange2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotInRange2.kt"); doTest(fileName); } @TestMetadata("NotJavaSAM.kt") public void testNotJavaSAM() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotJavaSAM.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/NotJavaSAM.kt"); doTest(fileName); } @TestMetadata("ParametersNotUsed.kt") public void testParametersNotUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ParametersNotUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ParametersNotUsed.kt"); doTest(fileName); } @TestMetadata("QualifiedReturn.kt") public void testQualifiedReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/QualifiedReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/QualifiedReturn.kt"); doTest(fileName); } @TestMetadata("ReturnNoValue.kt") public void testReturnNoValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnNoValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnNoValue.kt"); doTest(fileName); } @TestMetadata("ReturnNotLast.kt") public void testReturnNotLast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnNotLast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnNotLast.kt"); doTest(fileName); } @TestMetadata("ReturnsInIf.kt") public void testReturnsInIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnsInIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnsInIf.kt"); doTest(fileName); } @TestMetadata("ReturnsInWhen.kt") public void testReturnsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ReturnsInWhen.kt"); doTest(fileName); } @TestMetadata("SamAdapterNeededBecauseOfLabeledReturn.kt") public void testSamAdapterNeededBecauseOfLabeledReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/SamAdapterNeededBecauseOfLabeledReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/SamAdapterNeededBecauseOfLabeledReturn.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/Simple.kt"); doTest(fileName); } @TestMetadata("SingleReturn.kt") public void testSingleReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/SingleReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/SingleReturn.kt"); doTest(fileName); } @TestMetadata("StatementAndReturn.kt") public void testStatementAndReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/StatementAndReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/StatementAndReturn.kt"); doTest(fileName); } @TestMetadata("TwoFunctions.kt") public void testTwoFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/TwoFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/TwoFunctions.kt"); doTest(fileName); } @@ -5980,162 +5980,162 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class OperatorToFunction extends AbstractIntentionTest { public void testAllFilesPresentInOperatorToFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/operatorToFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/operatorToFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("arrayAccessMultipleIndex.kt") public void testArrayAccessMultipleIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessMultipleIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessMultipleIndex.kt"); doTest(fileName); } @TestMetadata("arrayAccessOneIndex.kt") public void testArrayAccessOneIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessOneIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessOneIndex.kt"); doTest(fileName); } @TestMetadata("arrayAssignmentMultipleIndex.kt") public void testArrayAssignmentMultipleIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAssignmentMultipleIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAssignmentMultipleIndex.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/assignment.kt"); doTest(fileName); } @TestMetadata("binaryEqualsEqualsNullableOperands.kt") public void testBinaryEqualsEqualsNullableOperands() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt"); doTest(fileName); } @TestMetadata("binaryNotEqualsNonNullableOperands.kt") public void testBinaryNotEqualsNonNullableOperands() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotEqualsNonNullableOperands.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotEqualsNonNullableOperands.kt"); doTest(fileName); } @TestMetadata("binaryNotIn.kt") public void testBinaryNotIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotIn.kt"); doTest(fileName); } @TestMetadata("binaryPlus.kt") public void testBinaryPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlus.kt"); doTest(fileName); } @TestMetadata("binaryPlusEquals.kt") public void testBinaryPlusEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEquals.kt"); doTest(fileName); } @TestMetadata("binaryPlusEqualsNotResolved.kt") public void testBinaryPlusEqualsNotResolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEqualsNotResolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEqualsNotResolved.kt"); doTest(fileName); } @TestMetadata("binaryRangeTo.kt") public void testBinaryRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryRangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryRangeTo.kt"); doTest(fileName); } @TestMetadata("compoundAssignment.kt") public void testCompoundAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/compoundAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/compoundAssignment.kt"); doTest(fileName); } @TestMetadata("compoundAssignment2.kt") public void testCompoundAssignment2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/compoundAssignment2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/compoundAssignment2.kt"); doTest(fileName); } @TestMetadata("functionCallMultipleArgument.kt") public void testFunctionCallMultipleArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallMultipleArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallMultipleArgument.kt"); doTest(fileName); } @TestMetadata("functionCallWithMultipleArgumentsAndSingleLambda.kt") public void testFunctionCallWithMultipleArgumentsAndSingleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithMultipleArgumentsAndSingleLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithMultipleArgumentsAndSingleLambda.kt"); doTest(fileName); } @TestMetadata("functionCallWithSingleLambda.kt") public void testFunctionCallWithSingleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithSingleLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithSingleLambda.kt"); doTest(fileName); } @TestMetadata("inRightSideOfAssignment.kt") public void testInRightSideOfAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt"); doTest(fileName); } @TestMetadata("keepComments.kt") public void testKeepComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/keepComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/keepComments.kt"); doTest(fileName); } @TestMetadata("notApplicableAssignment.kt") public void testNotApplicableAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableAssignment.kt"); doTest(fileName); } @TestMetadata("notApplicableCallWithInvokeMethod.kt") public void testNotApplicableCallWithInvokeMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableCallWithInvokeMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableCallWithInvokeMethod.kt"); doTest(fileName); } @TestMetadata("notApplicableFunctionCallWithCallableReference.kt") public void testNotApplicableFunctionCallWithCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableFunctionCallWithCallableReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableFunctionCallWithCallableReference.kt"); doTest(fileName); } @TestMetadata("notApplicableNewClassObject.kt") public void testNotApplicableNewClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableNewClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableNewClassObject.kt"); doTest(fileName); } @TestMetadata("pluPlus.kt") public void testPluPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/pluPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/pluPlus.kt"); doTest(fileName); } @TestMetadata("postfixMinusMinus.kt") public void testPostfixMinusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/postfixMinusMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/postfixMinusMinus.kt"); doTest(fileName); } @TestMetadata("prefixPlus.kt") public void testPrefixPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlus.kt"); doTest(fileName); } @TestMetadata("prefixPlusPlus.kt") public void testPrefixPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlusPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlusPlus.kt"); doTest(fileName); } } @@ -6145,36 +6145,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReconstructTypeInCastOrIs extends AbstractIntentionTest { public void testAllFilesPresentInReconstructTypeInCastOrIs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/reconstructTypeInCastOrIs"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/reconstructTypeInCastOrIs"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("completeGenericType.kt") public void testCompleteGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/completeGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/completeGenericType.kt"); doTest(fileName); } @TestMetadata("completeType.kt") public void testCompleteType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/completeType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/completeType.kt"); doTest(fileName); } @TestMetadata("errorType.kt") public void testErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/errorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/errorType.kt"); doTest(fileName); } @TestMetadata("reconstructableType.kt") public void testReconstructableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/reconstructableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/reconstructableType.kt"); doTest(fileName); } @TestMetadata("typeInDeclaration.kt") public void testTypeInDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/typeInDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/reconstructTypeInCastOrIs/typeInDeclaration.kt"); doTest(fileName); } } @@ -6184,60 +6184,60 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveArgumentName extends AbstractIntentionTest { public void testAllFilesPresentInRemoveArgumentName() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeArgumentName"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeArgumentName"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("namedArgumentBefore.kt") public void testNamedArgumentBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/namedArgumentBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/namedArgumentBefore.kt"); doTest(fileName); } @TestMetadata("noExpression.kt") public void testNoExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/noExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/noExpression.kt"); doTest(fileName); } @TestMetadata("notInPosition.kt") public void testNotInPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notInPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notInPosition.kt"); doTest(fileName); } @TestMetadata("notInRange.kt") public void testNotInRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notInRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notInRange.kt"); doTest(fileName); } @TestMetadata("notNamed.kt") public void testNotNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notNamed.kt"); doTest(fileName); } @TestMetadata("notResolved.kt") public void testNotResolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notResolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/notResolved.kt"); doTest(fileName); } @TestMetadata("range.kt") public void testRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/range.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/range.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/simple.kt"); doTest(fileName); } @TestMetadata("star.kt") public void testStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/star.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeArgumentName/star.kt"); doTest(fileName); } } @@ -6247,78 +6247,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveBraces extends AbstractIntentionTest { public void testAllFilesPresentInRemoveBraces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeBraces"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeBraces"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhile.kt"); doTest(fileName); } @TestMetadata("doWhileWithTwoStatements.kt") public void testDoWhileWithTwoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt"); doTest(fileName); } @TestMetadata("else.kt") public void testElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/else.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/else.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/for.kt"); doTest(fileName); } @TestMetadata("forWithLocalVariable.kt") public void testForWithLocalVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/forWithLocalVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/forWithLocalVariable.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/if.kt"); doTest(fileName); } @TestMetadata("ifWithComment.kt") public void testIfWithComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithComment.kt"); doTest(fileName); } @TestMetadata("ifWithNoStatement.kt") public void testIfWithNoStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithNoStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithNoStatement.kt"); doTest(fileName); } @TestMetadata("ifWithSemicolon.kt") public void testIfWithSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithSemicolon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithSemicolon.kt"); doTest(fileName); } @TestMetadata("ifWithTwoStatements.kt") public void testIfWithTwoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithTwoStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithTwoStatements.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/while.kt"); doTest(fileName); } @TestMetadata("whileWithTwoStatements.kt") public void testWhileWithTwoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/whileWithTwoStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/whileWithTwoStatements.kt"); doTest(fileName); } } @@ -6328,72 +6328,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveCurlyBracesFromTemplate extends AbstractIntentionTest { public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("necessaryBrackets1.kt") public void testNecessaryBrackets1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt"); doTest(fileName); } @TestMetadata("necessaryBrackets2.kt") public void testNecessaryBrackets2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt"); doTest(fileName); } @TestMetadata("necessaryBrackets3.kt") public void testNecessaryBrackets3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt"); doTest(fileName); } @TestMetadata("necessaryBrackets4.kt") public void testNecessaryBrackets4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt"); doTest(fileName); } @TestMetadata("necessaryBrackets5.kt") public void testNecessaryBrackets5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets1.kt") public void testUnnecessaryBrackets1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets2.kt") public void testUnnecessaryBrackets2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets3.kt") public void testUnnecessaryBrackets3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets4.kt") public void testUnnecessaryBrackets4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets5.kt") public void testUnnecessaryBrackets5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt"); doTest(fileName); } @TestMetadata("unnecessaryBrackets6.kt") public void testUnnecessaryBrackets6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt"); doTest(fileName); } } @@ -6403,42 +6403,42 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExplicitLambdaParameterTypes extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitLambdaParameterTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitLambdaParameterTypes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitLambdaParameterTypes"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("invalidCursorPosition.kt") public void testInvalidCursorPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/invalidCursorPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/invalidCursorPosition.kt"); doTest(fileName); } @TestMetadata("lambdaWithLambdaAsParam.kt") public void testLambdaWithLambdaAsParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/lambdaWithLambdaAsParam.kt"); doTest(fileName); } @TestMetadata("multipleExplicitParams.kt") public void testMultipleExplicitParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/multipleExplicitParams.kt"); doTest(fileName); } @TestMetadata("paramTypeDeclared.kt") public void testParamTypeDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/paramTypeDeclared.kt"); doTest(fileName); } @TestMetadata("singleExplicitParam.kt") public void testSingleExplicitParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/singleExplicitParam.kt"); doTest(fileName); } @TestMetadata("typesAlreadyImplicit.kt") public void testTypesAlreadyImplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/typesAlreadyImplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitLambdaParameterTypes/typesAlreadyImplicit.kt"); doTest(fileName); } } @@ -6448,72 +6448,72 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExplicitSuperQualifier extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitSuperQualifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitSuperQualifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitSuperQualifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("AmbiguousSuperMethod.kt") public void testAmbiguousSuperMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/AmbiguousSuperMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/AmbiguousSuperMethod.kt"); doTest(fileName); } @TestMetadata("AmbiguousSuperProperty.kt") public void testAmbiguousSuperProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/AmbiguousSuperProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/AmbiguousSuperProperty.kt"); doTest(fileName); } @TestMetadata("DataFlowInfoUsed.kt") public void testDataFlowInfoUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/DataFlowInfoUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/DataFlowInfoUsed.kt"); doTest(fileName); } @TestMetadata("IncompleteCall.kt") public void testIncompleteCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCall.kt"); doTest(fileName); } @TestMetadata("IncompleteCallAmbiguous.kt") public void testIncompleteCallAmbiguous() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt"); doTest(fileName); } @TestMetadata("SingleSuper.kt") public void testSingleSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/SingleSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/SingleSuper.kt"); doTest(fileName); } @TestMetadata("SuperWithLabel.kt") public void testSuperWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/SuperWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/SuperWithLabel.kt"); doTest(fileName); } @TestMetadata("UnambiguousSuperMethod.kt") public void testUnambiguousSuperMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/UnambiguousSuperMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/UnambiguousSuperMethod.kt"); doTest(fileName); } @TestMetadata("UnambiguousSuperProperty.kt") public void testUnambiguousSuperProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/UnambiguousSuperProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/UnambiguousSuperProperty.kt"); doTest(fileName); } @TestMetadata("WrongOffset1.kt") public void testWrongOffset1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/WrongOffset1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/WrongOffset1.kt"); doTest(fileName); } @TestMetadata("WrongOffset2.kt") public void testWrongOffset2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/WrongOffset2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/WrongOffset2.kt"); doTest(fileName); } @@ -6524,36 +6524,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExplicitType extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitType"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitType"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("notOnParameterOfFunctionType.kt") public void testNotOnParameterOfFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/notOnParameterOfFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/notOnParameterOfFunctionType.kt"); doTest(fileName); } @TestMetadata("onOverride.kt") public void testOnOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onOverride.kt"); doTest(fileName); } @TestMetadata("onOverrideInTrait.kt") public void testOnOverrideInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onOverrideInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onOverrideInTrait.kt"); doTest(fileName); } @TestMetadata("onType.kt") public void testOnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/onType.kt"); doTest(fileName); } @TestMetadata("removeUnresolvedType.kt") public void testRemoveUnresolvedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt"); doTest(fileName); } } @@ -6563,138 +6563,138 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExplicitTypeArguments extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitTypeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitTypeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("fourLiterals.kt") public void testFourLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt"); doTest(fileName); } @TestMetadata("functionBodyIsCallWithUnnecessaryTypeArgs.kt") public void testFunctionBodyIsCallWithUnnecessaryTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/functionBodyIsCallWithUnnecessaryTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/functionBodyIsCallWithUnnecessaryTypeArgs.kt"); doTest(fileName); } @TestMetadata("inapplicableTypeThatIsAFunItCannotBeInferred.kt") public void testInapplicableTypeThatIsAFunItCannotBeInferred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt"); doTest(fileName); } @TestMetadata("lambdaType.kt") public void testLambdaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt"); doTest(fileName); } @TestMetadata("literalAny.kt") public void testLiteralAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalAny.kt"); doTest(fileName); } @TestMetadata("literalString.kt") public void testLiteralString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalString.kt"); doTest(fileName); } @TestMetadata("literalStringWithClass.kt") public void testLiteralStringWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalStringWithClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalStringWithClass.kt"); doTest(fileName); } @TestMetadata("literalsWhenTypeArgHasTypeArg.kt") public void testLiteralsWhenTypeArgHasTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalsWhenTypeArgHasTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalsWhenTypeArgHasTypeArg.kt"); doTest(fileName); } @TestMetadata("mapGet.kt") public void testMapGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/mapGet.kt"); doTest(fileName); } @TestMetadata("nestedCall-KT-5028.kt") public void testNestedCall_KT_5028() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/nestedCall-KT-5028.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/nestedCall-KT-5028.kt"); doTest(fileName); } @TestMetadata("notApplicableNotEnoughtInfo.kt") public void testNotApplicableNotEnoughtInfo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableNotEnoughtInfo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableNotEnoughtInfo.kt"); doTest(fileName); } @TestMetadata("notApplicableSupertypeOfInferred.kt") public void testNotApplicableSupertypeOfInferred() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt"); doTest(fileName); } @TestMetadata("notApplicableSupertypeOfInferredClass.kt") public void testNotApplicableSupertypeOfInferredClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferredClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferredClass.kt"); doTest(fileName); } @TestMetadata("platforrmType1.kt") public void testPlatforrmType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/platforrmType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/platforrmType1.kt"); doTest(fileName); } @TestMetadata("platforrmType2.kt") public void testPlatforrmType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/platforrmType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/platforrmType2.kt"); doTest(fileName); } @TestMetadata("propertyInitializerIsCallWithUnnecessaryTypeArgs.kt") public void testPropertyInitializerIsCallWithUnnecessaryTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/propertyInitializerIsCallWithUnnecessaryTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/propertyInitializerIsCallWithUnnecessaryTypeArgs.kt"); doTest(fileName); } @TestMetadata("returnCallWithUnnecessaryTypeArgs.kt") public void testReturnCallWithUnnecessaryTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/returnCallWithUnnecessaryTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/returnCallWithUnnecessaryTypeArgs.kt"); doTest(fileName); } @TestMetadata("twoLiteralValues.kt") public void testTwoLiteralValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt"); doTest(fileName); } @TestMetadata("variableString.kt") public void testVariableString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString.kt"); doTest(fileName); } @TestMetadata("variableString2.kt") public void testVariableString2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt"); doTest(fileName); } @TestMetadata("variableStringFartherScope.kt") public void testVariableStringFartherScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt"); doTest(fileName); } @TestMetadata("variablesAndLiterals.kt") public void testVariablesAndLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt"); doTest(fileName); } @@ -6705,36 +6705,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveForLoopIndices extends AbstractIntentionTest { public void testAllFilesPresentInRemoveForLoopIndices() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inapplicableForLoop.kt") public void testInapplicableForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt"); doTest(fileName); } @TestMetadata("inapplicableIndexUse.kt") public void testInapplicableIndexUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt"); doTest(fileName); } @TestMetadata("inapplicableOverridenFunction.kt") public void testInapplicableOverridenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt"); doTest(fileName); } @TestMetadata("loopWithType.kt") public void testLoopWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/loopWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/loopWithType.kt"); doTest(fileName); } @TestMetadata("simpleLoopWithIndices.kt") public void testSimpleLoopWithIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt"); doTest(fileName); } } @@ -6744,84 +6744,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveUnnecessaryParentheses extends AbstractIntentionTest { public void testAllFilesPresentInRemoveUnnecessaryParentheses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("necessaryParentheses1.kt") public void testNecessaryParentheses1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt"); doTest(fileName); } @TestMetadata("necessaryParentheses2.kt") public void testNecessaryParentheses2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt"); doTest(fileName); } @TestMetadata("necessaryParentheses3.kt") public void testNecessaryParentheses3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt"); doTest(fileName); } @TestMetadata("necessaryParentheses4.kt") public void testNecessaryParentheses4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt"); doTest(fileName); } @TestMetadata("necessaryParentheses5.kt") public void testNecessaryParentheses5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses1.kt") public void testUnnecessaryParentheses1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses2.kt") public void testUnnecessaryParentheses2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses3.kt") public void testUnnecessaryParentheses3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses4.kt") public void testUnnecessaryParentheses4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses5.kt") public void testUnnecessaryParentheses5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses6.kt") public void testUnnecessaryParentheses6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses7.kt") public void testUnnecessaryParentheses7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt"); doTest(fileName); } @TestMetadata("unnecessaryParentheses8.kt") public void testUnnecessaryParentheses8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt"); doTest(fileName); } } @@ -6831,60 +6831,60 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceExplicitFunctionLiteralParamWithIt extends AbstractIntentionTest { public void testAllFilesPresentInReplaceExplicitFunctionLiteralParamWithIt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("applicable_cursofOverParamInInnerLiteral.kt") public void testApplicable_cursofOverParamInInnerLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursofOverParamInInnerLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursofOverParamInInnerLiteral.kt"); doTest(fileName); } @TestMetadata("applicable_cursorOverParameterDeclaration.kt") public void testApplicable_cursorOverParameterDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt"); doTest(fileName); } @TestMetadata("applicable_cursorOverParameterUse.kt") public void testApplicable_cursorOverParameterUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt"); doTest(fileName); } @TestMetadata("applicable_formatsProperly.kt") public void testApplicable_formatsProperly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_formatsProperly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_formatsProperly.kt"); doTest(fileName); } @TestMetadata("notApplicable_alreadyUsesImplicitIt.kt") public void testNotApplicable_alreadyUsesImplicitIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt"); doTest(fileName); } @TestMetadata("notApplicable_hasMultipleParameters.kt") public void testNotApplicable_hasMultipleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_hasMultipleParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_hasMultipleParameters.kt"); doTest(fileName); } @TestMetadata("notApplicable_notFunctionLiteralParameter.kt") public void testNotApplicable_notFunctionLiteralParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_notFunctionLiteralParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_notFunctionLiteralParameter.kt"); doTest(fileName); } @TestMetadata("notApplicable_parameterHasExplicitType.kt") public void testNotApplicable_parameterHasExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_parameterHasExplicitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_parameterHasExplicitType.kt"); doTest(fileName); } @TestMetadata("notApplicable_wrongPosition.kt") public void testNotApplicable_wrongPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt"); doTest(fileName); } } @@ -6894,36 +6894,36 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceItWithExplicitFunctionLiteralParam extends AbstractIntentionTest { public void testAllFilesPresentInReplaceItWithExplicitFunctionLiteralParam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("applicable.kt") public void testApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt"); doTest(fileName); } @TestMetadata("applicable_nestedFunctionLiterals.kt") public void testApplicable_nestedFunctionLiterals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionLiterals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionLiterals.kt"); doTest(fileName); } @TestMetadata("applicable_nestedFunctionWithIt.kt") public void testApplicable_nestedFunctionWithIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionWithIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionWithIt.kt"); doTest(fileName); } @TestMetadata("notApplicable_localVariableIt.kt") public void testNotApplicable_localVariableIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_localVariableIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_localVariableIt.kt"); doTest(fileName); } @TestMetadata("notApplicable_parameterExplicitlyNamedIt.kt") public void testNotApplicable_parameterExplicitlyNamedIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_parameterExplicitlyNamedIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_parameterExplicitlyNamedIt.kt"); doTest(fileName); } } @@ -6933,66 +6933,66 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceWithOperatorAssignment extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithOperatorAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("illegalMultipleOperators.kt") public void testIllegalMultipleOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt"); doTest(fileName); } @TestMetadata("illegalMultipleOperatorsMiddle.kt") public void testIllegalMultipleOperatorsMiddle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt"); doTest(fileName); } @TestMetadata("invalidSubtraction.kt") public void testInvalidSubtraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt"); doTest(fileName); } @TestMetadata("multipleOperators.kt") public void testMultipleOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt"); doTest(fileName); } @TestMetadata("multipleOperatorsRightSideRepeat.kt") public void testMultipleOperatorsRightSideRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt"); doTest(fileName); } @TestMetadata("nonCommutativeRepeat.kt") public void testNonCommutativeRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonCommutativeRepeat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonCommutativeRepeat.kt"); doTest(fileName); } @TestMetadata("nonRepeatingAssignment.kt") public void testNonRepeatingAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt"); doTest(fileName); } @TestMetadata("rightSideRepeat.kt") public void testRightSideRepeat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt"); doTest(fileName); } @TestMetadata("simpleAssign.kt") public void testSimpleAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt"); doTest(fileName); } @TestMetadata("validSubtraction.kt") public void testValidSubtraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt"); doTest(fileName); } } @@ -7002,30 +7002,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceWithOrdinaryAssignment extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithOrdinaryAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOrdinaryAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOrdinaryAssignment"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexRightExpression.kt") public void testComplexRightExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt"); doTest(fileName); } @TestMetadata("nonAssignmentExpression.kt") public void testNonAssignmentExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt"); doTest(fileName); } @TestMetadata("nonAugmentedAssign.kt") public void testNonAugmentedAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt"); doTest(fileName); } } @@ -7035,126 +7035,126 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SimplifyBooleanWithConstants extends AbstractIntentionTest { public void testAllFilesPresentInSimplifyBooleanWithConstants() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyBooleanWithConstants"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyBooleanWithConstants"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("deeplyParenthesized.kt") public void testDeeplyParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/deeplyParenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/deeplyParenthesized.kt"); doTest(fileName); } @TestMetadata("inapplicableNoConstants.kt") public void testInapplicableNoConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNoConstants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNoConstants.kt"); doTest(fileName); } @TestMetadata("inapplicableNotBinary.kt") public void testInapplicableNotBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNotBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNotBinary.kt"); doTest(fileName); } @TestMetadata("inapplicableUsesVals.kt") public void testInapplicableUsesVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals.kt"); doTest(fileName); } @TestMetadata("inapplicableUsesVals2.kt") public void testInapplicableUsesVals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals2.kt"); doTest(fileName); } @TestMetadata("inapplicableUsesVals3.kt") public void testInapplicableUsesVals3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals3.kt"); doTest(fileName); } @TestMetadata("reduceableBinary.kt") public void testReduceableBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt"); doTest(fileName); } @TestMetadata("reduceableBinary2.kt") public void testReduceableBinary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt"); doTest(fileName); } @TestMetadata("reduceableBinary3.kt") public void testReduceableBinary3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt"); doTest(fileName); } @TestMetadata("reduceableBinaryWithParenthese.kt") public void testReduceableBinaryWithParenthese() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simple.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinaries.kt") public void testSimpleWithMoreBinaries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinaries2.kt") public void testSimpleWithMoreBinaries2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries2.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinaries3.kt") public void testSimpleWithMoreBinaries3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries3.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinariesAndParentheses.kt") public void testSimpleWithMoreBinariesAndParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinariesAndParentheses2.kt") public void testSimpleWithMoreBinariesAndParentheses2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses2.kt"); doTest(fileName); } @TestMetadata("simpleWithMoreBinariesAndParentheses3.kt") public void testSimpleWithMoreBinariesAndParentheses3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses3.kt"); doTest(fileName); } @TestMetadata("simpleWithNonsensical2.kt") public void testSimpleWithNonsensical2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithNonsensical2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithNonsensical2.kt"); doTest(fileName); } @TestMetadata("simpleWithParentheses.kt") public void testSimpleWithParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses.kt"); doTest(fileName); } @TestMetadata("simpleWithParentheses2.kt") public void testSimpleWithParentheses2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses2.kt"); doTest(fileName); } } @@ -7164,78 +7164,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SimplifyNegatedBinaryExpression extends AbstractIntentionTest { public void testAllFilesPresentInSimplifyNegatedBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyNegatedBinaryExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyNegatedBinaryExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/equals.kt"); doTest(fileName); } @TestMetadata("greaterThan.kt") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThan.kt"); doTest(fileName); } @TestMetadata("greaterThanOrEquals.kt") public void testGreaterThanOrEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt"); doTest(fileName); } @TestMetadata("in.kt") public void testIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/in.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/in.kt"); doTest(fileName); } @TestMetadata("inapplicableBinaryOperation.kt") public void testInapplicableBinaryOperation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inapplicableBinaryOperation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/inapplicableBinaryOperation.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/is.kt"); doTest(fileName); } @TestMetadata("lessThan.kt") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/lessThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/lessThan.kt"); doTest(fileName); } @TestMetadata("lessThanOrEquals.kt") public void testLessThanOrEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/lessThanOrEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/lessThanOrEquals.kt"); doTest(fileName); } @TestMetadata("notEquals.kt") public void testNotEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notEquals.kt"); doTest(fileName); } @TestMetadata("notIn.kt") public void testNotIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notIn.kt"); doTest(fileName); } @TestMetadata("notIs.kt") public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/notIs.kt"); doTest(fileName); } @TestMetadata("simpleInvert.kt") public void testSimpleInvert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/simpleInvert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/simpleInvert.kt"); doTest(fileName); } @@ -7246,84 +7246,84 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SpecifyExplicitLambdaSignature extends AbstractIntentionTest { public void testAllFilesPresentInSpecifyExplicitLambdaSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyExplicitLambdaSignature"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyExplicitLambdaSignature"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("coercionToUnit.kt") public void testCoercionToUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/coercionToUnit.kt"); doTest(fileName); } @TestMetadata("emptyParamListWithBrackets.kt") public void testEmptyParamListWithBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithBrackets.kt"); doTest(fileName); } @TestMetadata("emptyParamListWithIt.kt") public void testEmptyParamListWithIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithIt.kt"); doTest(fileName); } @TestMetadata("emptyParamListWithWhiteSpace.kt") public void testEmptyParamListWithWhiteSpace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithWhiteSpace.kt"); doTest(fileName); } @TestMetadata("emptyParamListWithoutItWithArrow.kt") public void testEmptyParamListWithoutItWithArrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithoutItWithArrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/emptyParamListWithoutItWithArrow.kt"); doTest(fileName); } @TestMetadata("invalidCursorPosition.kt") public void testInvalidCursorPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/invalidCursorPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/invalidCursorPosition.kt"); doTest(fileName); } @TestMetadata("lambdaWithLambdaAsParam.kt") public void testLambdaWithLambdaAsParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/lambdaWithLambdaAsParam.kt"); doTest(fileName); } @TestMetadata("manyNewlines.kt") public void testManyNewlines() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/manyNewlines.kt"); doTest(fileName); } @TestMetadata("multipleParam.kt") public void testMultipleParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/multipleParam.kt"); doTest(fileName); } @TestMetadata("shortenReferencesForParams.kt") public void testShortenReferencesForParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt"); doTest(fileName); } @TestMetadata("singleParam.kt") public void testSingleParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/singleParam.kt"); doTest(fileName); } @TestMetadata("typesAlreadyExplicit.kt") public void testTypesAlreadyExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesAlreadyExplicit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesAlreadyExplicit.kt"); doTest(fileName); } @TestMetadata("typesNotInferable.kt") public void testTypesNotInferable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesNotInferable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyExplicitLambdaSignature/typesNotInferable.kt"); doTest(fileName); } } @@ -7333,78 +7333,78 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SpecifyTypeExplicitly extends AbstractIntentionTest { public void testAllFilesPresentInSpecifyTypeExplicitly() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyTypeExplicitly"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyTypeExplicitly"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("badCaretPosition.kt") public void testBadCaretPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/badCaretPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/badCaretPosition.kt"); doTest(fileName); } @TestMetadata("classNameClashing.kt") public void testClassNameClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/classNameClashing.kt"); doTest(fileName); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/constructor.kt"); doTest(fileName); } @TestMetadata("enumType.kt") public void testEnumType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/enumType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/enumType.kt"); doTest(fileName); } @TestMetadata("functionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/functionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/functionType.kt"); doTest(fileName); } @TestMetadata("lambdaParam.kt") public void testLambdaParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/lambdaParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/lambdaParam.kt"); doTest(fileName); } @TestMetadata("loopParameter.kt") public void testLoopParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/loopParameter.kt"); doTest(fileName); } @TestMetadata("publicMember.kt") public void testPublicMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/publicMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/publicMember.kt"); doTest(fileName); } @TestMetadata("stringRedefined.kt") public void testStringRedefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/stringRedefined.kt"); doTest(fileName); } @TestMetadata("typeAlreadyProvided.kt") public void testTypeAlreadyProvided() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt"); doTest(fileName); } @TestMetadata("unitType.kt") public void testUnitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unitType.kt"); doTest(fileName); } @TestMetadata("unknownType.kt") public void testUnknownType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unknownType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/specifyTypeExplicitly/unknownType.kt"); doTest(fileName); } } @@ -7414,156 +7414,156 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SplitIf extends AbstractIntentionTest { public void testAllFilesPresentInSplitIf() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("and.kt") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/and.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/and.kt"); doTest(fileName); } @TestMetadata("caretOnIf.kt") public void testCaretOnIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/caretOnIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/caretOnIf.kt"); doTest(fileName); } @TestMetadata("ifAndOr.kt") public void testIfAndOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndOr.kt"); doTest(fileName); } @TestMetadata("ifAndOrWithBraces.kt") public void testIfAndOrWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndOrWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndOrWithBraces.kt"); doTest(fileName); } @TestMetadata("ifAndWithBraces.kt") public void testIfAndWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifAndWithBraces.kt"); doTest(fileName); } @TestMetadata("ifOrReturn.kt") public void testIfOrReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifOrReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifOrReturn.kt"); doTest(fileName); } @TestMetadata("ifWithElse.kt") public void testIfWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/ifWithElse.kt"); doTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/localFunction.kt"); doTest(fileName); } @TestMetadata("nestedIf.kt") public void testNestedIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIf.kt"); doTest(fileName); } @TestMetadata("nestedIfNotApplicable.kt") public void testNestedIfNotApplicable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIfNotApplicable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIfNotApplicable.kt"); doTest(fileName); } @TestMetadata("nestedIfOutside.kt") public void testNestedIfOutside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIfOutside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedIfOutside.kt"); doTest(fileName); } @TestMetadata("nestedInside.kt") public void testNestedInside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedInside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/nestedInside.kt"); doTest(fileName); } @TestMetadata("notIf.kt") public void testNotIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/notIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/notIf.kt"); doTest(fileName); } @TestMetadata("onIfWithOr.kt") public void testOnIfWithOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/onIfWithOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/onIfWithOr.kt"); doTest(fileName); } @TestMetadata("operatorAsFunctionParam.kt") public void testOperatorAsFunctionParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/operatorAsFunctionParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/operatorAsFunctionParam.kt"); doTest(fileName); } @TestMetadata("operatorOutsideIf.kt") public void testOperatorOutsideIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/operatorOutsideIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/operatorOutsideIf.kt"); doTest(fileName); } @TestMetadata("orAnd.kt") public void testOrAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/orAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/orAnd.kt"); doTest(fileName); } @TestMetadata("orWithBraces.kt") public void testOrWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/orWithBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/orWithBraces.kt"); doTest(fileName); } @TestMetadata("twoOperatorsFirst.kt") public void testTwoOperatorsFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/twoOperatorsFirst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/twoOperatorsFirst.kt"); doTest(fileName); } @TestMetadata("twoOperatorsSecond.kt") public void testTwoOperatorsSecond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/twoOperatorsSecond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/twoOperatorsSecond.kt"); doTest(fileName); } @TestMetadata("withNotOperator.kt") public void testWithNotOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withNotOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withNotOperator.kt"); doTest(fileName); } @TestMetadata("withNotOperatorGood.kt") public void testWithNotOperatorGood() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withNotOperatorGood.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withNotOperatorGood.kt"); doTest(fileName); } @TestMetadata("withOR.kt") public void testWithOR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withOR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withOR.kt"); doTest(fileName); } @TestMetadata("withORElse.kt") public void testWithORElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withORElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/withORElse.kt"); doTest(fileName); } @TestMetadata("wrongCaretLocation.kt") public void testWrongCaretLocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/wrongCaretLocation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/wrongCaretLocation.kt"); doTest(fileName); } @@ -7572,30 +7572,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class KeepComments extends AbstractIntentionTest { public void testAllFilesPresentInKeepComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("ifOrReturn.kt") public void testIfOrReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/ifOrReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/ifOrReturn.kt"); doTest(fileName); } @TestMetadata("twoOperators.kt") public void testTwoOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/twoOperators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/twoOperators.kt"); doTest(fileName); } @TestMetadata("withAnd.kt") public void testWithAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/withAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/withAnd.kt"); doTest(fileName); } @TestMetadata("withOR.kt") public void testWithOR() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/withOR.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/splitIf/keepComments/withOR.kt"); doTest(fileName); } } @@ -7606,312 +7606,312 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class SwapBinaryExpression extends AbstractIntentionTest { public void testAllFilesPresentInSwapBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/swapBinaryExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/swapBinaryExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/assignment.kt"); doTest(fileName); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/compareTo.kt"); doTest(fileName); } @TestMetadata("conjunction.kt") public void testConjunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunction.kt"); doTest(fileName); } @TestMetadata("conjunctionLiteral.kt") public void testConjunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunctionLiteral.kt"); doTest(fileName); } @TestMetadata("disjunction.kt") public void testDisjunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunction.kt"); doTest(fileName); } @TestMetadata("disjunctionLiteral.kt") public void testDisjunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunctionLiteral.kt"); doTest(fileName); } @TestMetadata("divide.kt") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divide.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divide.kt"); doTest(fileName); } @TestMetadata("divideAssign.kt") public void testDivideAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideAssign.kt"); doTest(fileName); } @TestMetadata("divideLiteral.kt") public void testDivideLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideLiteral.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equals.kt"); doTest(fileName); } @TestMetadata("equalsLiteral.kt") public void testEqualsLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equalsLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equalsLiteral.kt"); doTest(fileName); } @TestMetadata("greaterThan.kt") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThan.kt"); doTest(fileName); } @TestMetadata("greaterThanEquals.kt") public void testGreaterThanEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThanEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThanEquals.kt"); doTest(fileName); } @TestMetadata("identityEquals.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEquals.kt"); doTest(fileName); } @TestMetadata("identityEqualsLiteral.kt") public void testIdentityEqualsLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEqualsLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEqualsLiteral.kt"); doTest(fileName); } @TestMetadata("in.kt") public void testIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/in.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/in.kt"); doTest(fileName); } @TestMetadata("infixFunction.kt") public void testInfixFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/infixFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/infixFunction.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/is.kt"); doTest(fileName); } @TestMetadata("lessThan.kt") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThan.kt"); doTest(fileName); } @TestMetadata("lessThanEquals.kt") public void testLessThanEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThanEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThanEquals.kt"); doTest(fileName); } @TestMetadata("minus.kt") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minus.kt"); doTest(fileName); } @TestMetadata("minusAssign.kt") public void testMinusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusAssign.kt"); doTest(fileName); } @TestMetadata("minusLiteral.kt") public void testMinusLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusLiteral.kt"); doTest(fileName); } @TestMetadata("multipleOperands.kt") public void testMultipleOperands() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperands.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperands.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence.kt") public void testMultipleOperandsWithDifferentPrecedence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence2.kt") public void testMultipleOperandsWithDifferentPrecedence2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence2.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence3.kt") public void testMultipleOperandsWithDifferentPrecedence3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence3.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence4.kt") public void testMultipleOperandsWithDifferentPrecedence4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence4.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence5.kt") public void testMultipleOperandsWithDifferentPrecedence5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence5.kt"); doTest(fileName); } @TestMetadata("multipleOperandsWithDifferentPrecedence6.kt") public void testMultipleOperandsWithDifferentPrecedence6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence6.kt"); doTest(fileName); } @TestMetadata("multiply.kt") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiply.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiply.kt"); doTest(fileName); } @TestMetadata("multiplyAssign.kt") public void testMultiplyAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiplyAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiplyAssign.kt"); doTest(fileName); } @TestMetadata("nonBinaryExpr.kt") public void testNonBinaryExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt"); doTest(fileName); } @TestMetadata("notEquals.kt") public void testNotEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notEquals.kt"); doTest(fileName); } @TestMetadata("notIdentityEquals.kt") public void testNotIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIdentityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIdentityEquals.kt"); doTest(fileName); } @TestMetadata("notIn.kt") public void testNotIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIn.kt"); doTest(fileName); } @TestMetadata("notIs.kt") public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIs.kt"); doTest(fileName); } @TestMetadata("nullOperand.kt") public void testNullOperand() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nullOperand.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nullOperand.kt"); doTest(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plus.kt"); doTest(fileName); } @TestMetadata("plusAssign.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusAssign.kt"); doTest(fileName); } @TestMetadata("plusInt.kt") public void testPlusInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusInt.kt"); doTest(fileName); } @TestMetadata("plusLiteral.kt") public void testPlusLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusLiteral.kt"); doTest(fileName); } @TestMetadata("plusMinus.kt") public void testPlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusMinus.kt"); doTest(fileName); } @TestMetadata("rangeTo.kt") public void testRangeTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeTo.kt"); doTest(fileName); } @TestMetadata("rangeToLiteral.kt") public void testRangeToLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeToLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeToLiteral.kt"); doTest(fileName); } @TestMetadata("remainder.kt") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainder.kt"); doTest(fileName); } @TestMetadata("remainderAssign.kt") public void testRemainderAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainderAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainderAssign.kt"); doTest(fileName); } @TestMetadata("times.kt") public void testTimes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/times.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/times.kt"); doTest(fileName); } @TestMetadata("timesAssign.kt") public void testTimesAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesAssign.kt"); doTest(fileName); } @TestMetadata("timesLiteral.kt") public void testTimesLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesLiteral.kt"); doTest(fileName); } @TestMetadata("xor.kt") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/xor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/xor.kt"); doTest(fileName); } } @@ -7921,120 +7921,120 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @RunWith(JUnit3RunnerWithInners.class) public static class ToInfixCall extends AbstractIntentionTest { public void testAllFilesPresentInToInfixCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/toInfixCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/toInfixCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("binaryExpressionArgument.kt") public void testBinaryExpressionArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/binaryExpressionArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/binaryExpressionArgument.kt"); doTest(fileName); } @TestMetadata("caretInsideCalleeExpr.kt") public void testCaretInsideCalleeExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/caretInsideCalleeExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/caretInsideCalleeExpr.kt"); doTest(fileName); } @TestMetadata("caretInsideReceiverExpr.kt") public void testCaretInsideReceiverExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/caretInsideReceiverExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/caretInsideReceiverExpr.kt"); doTest(fileName); } @TestMetadata("doubleFunctionCall.kt") public void testDoubleFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/doubleFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/doubleFunctionCall.kt"); doTest(fileName); } @TestMetadata("doubleFunctionCallWithoutParentheses.kt") public void testDoubleFunctionCallWithoutParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/doubleFunctionCallWithoutParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/doubleFunctionCallWithoutParentheses.kt"); doTest(fileName); } @TestMetadata("functionLiteralArgument.kt") public void testFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/functionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/functionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("functionSafeCall.kt") public void testFunctionSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/functionSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/functionSafeCall.kt"); doTest(fileName); } @TestMetadata("inapplicableCaretPosition.kt") public void testInapplicableCaretPosition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/inapplicableCaretPosition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/inapplicableCaretPosition.kt"); doTest(fileName); } @TestMetadata("multipleArguments.kt") public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/multipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/multipleArguments.kt"); doTest(fileName); } @TestMetadata("namedArgument.kt") public void testNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/namedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/namedArgument.kt"); doTest(fileName); } @TestMetadata("notInfix.kt") public void testNotInfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/notInfix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/notInfix.kt"); doTest(fileName); } @TestMetadata("nullAssertedReceiver.kt") public void testNullAssertedReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/nullAssertedReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/nullAssertedReceiver.kt"); doTest(fileName); } @TestMetadata("packageFunctionCall.kt") public void testPackageFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/packageFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/packageFunctionCall.kt"); doTest(fileName); } @TestMetadata("propertyAccess.kt") public void testPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/propertyAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/propertyAccess.kt"); doTest(fileName); } @TestMetadata("secondParameterLabeled.kt") public void testSecondParameterLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/secondParameterLabeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/secondParameterLabeled.kt"); doTest(fileName); } @TestMetadata("simpleArgumentAndFunctionLiteralArgument.kt") public void testSimpleArgumentAndFunctionLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/simpleArgumentAndFunctionLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/simpleArgumentAndFunctionLiteralArgument.kt"); doTest(fileName); } @TestMetadata("simpleMethodCall.kt") public void testSimpleMethodCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/simpleMethodCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/simpleMethodCall.kt"); doTest(fileName); } @TestMetadata("singlePackageFunctionCall.kt") public void testSinglePackageFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/singlePackageFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/singlePackageFunctionCall.kt"); doTest(fileName); } @TestMetadata("zeroArguments.kt") public void testZeroArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/zeroArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/toInfixCall/zeroArguments.kt"); doTest(fileName); } } @@ -8045,113 +8045,113 @@ public class IntentionTestGenerated extends AbstractIntentionTest { public static class UsePropertyAccessSyntax extends AbstractIntentionTest { @TestMetadata("accessThroughKotlinClassInstance.kt") public void testAccessThroughKotlinClassInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstance.kt"); doTest(fileName); } @TestMetadata("accessThroughKotlinClassInstanceWithOverride.kt") public void testAccessThroughKotlinClassInstanceWithOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstanceWithOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/accessThroughKotlinClassInstanceWithOverride.kt"); doTest(fileName); } public void testAllFilesPresentInUsePropertyAccessSyntax() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/usePropertyAccessSyntax"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/usePropertyAccessSyntax"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("conflict1.kt") public void testConflict1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/conflict1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/conflict1.kt"); doTest(fileName); } @TestMetadata("conflict2.kt") public void testConflict2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/conflict2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/conflict2.kt"); doTest(fileName); } @TestMetadata("genericClassMethod.kt") public void testGenericClassMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/genericClassMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/genericClassMethod.kt"); doTest(fileName); } @TestMetadata("get.kt") public void testGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/get.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/get.kt"); doTest(fileName); } @TestMetadata("getImplicitReceiver.kt") public void testGetImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/getImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/getImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("getSafeCall.kt") public void testGetSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/getSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/getSafeCall.kt"); doTest(fileName); } @TestMetadata("isGet.kt") public void testIsGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/isGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/isGet.kt"); doTest(fileName); } @TestMetadata("isSet.kt") public void testIsSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/isSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/isSet.kt"); doTest(fileName); } @TestMetadata("propertyTypeIsMoreSpecific1.kt") public void testPropertyTypeIsMoreSpecific1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/propertyTypeIsMoreSpecific1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/propertyTypeIsMoreSpecific1.kt"); doTest(fileName); } @TestMetadata("propertyTypeIsMoreSpecific2.kt") public void testPropertyTypeIsMoreSpecific2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/propertyTypeIsMoreSpecific2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/propertyTypeIsMoreSpecific2.kt"); doTest(fileName); } @TestMetadata("set.kt") public void testSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/set.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/set.kt"); doTest(fileName); } @TestMetadata("setImplicitReceiver.kt") public void testSetImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/setImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/setImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("setSafeCall.kt") public void testSetSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/setSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/setSafeCall.kt"); doTest(fileName); } @TestMetadata("smartCast.kt") public void testSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/smartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/smartCast.kt"); doTest(fileName); } @TestMetadata("superCall.kt") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/superCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/superCall.kt"); doTest(fileName); } @TestMetadata("typeParameterReceiver.kt") public void testTypeParameterReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/typeParameterReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/usePropertyAccessSyntax/typeParameterReceiver.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/MultiFileIntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/MultiFileIntentionTestGenerated.java index 8d9ee4a263e..66c639d9336 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/MultiFileIntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/MultiFileIntentionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class MultiFileIntentionTestGenerated extends AbstractMultiFileIntentionTest { public void testAllFilesPresentInMultiFileIntentions() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileIntentions"), Pattern.compile("^(.+)\\.test$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/multiFileIntentions"), Pattern.compile("^(.+)\\.test$")); } @TestMetadata("moveDeclarationToSeparateFile/moveClassToExistingFile/moveClassToExistingFile.test") public void testMoveDeclarationToSeparateFile_moveClassToExistingFile_MoveClassToExistingFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveClassToExistingFile/moveClassToExistingFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveClassToExistingFile/moveClassToExistingFile.test"); doTest(fileName); } @TestMetadata("moveDeclarationToSeparateFile/moveClassToFile/moveClassToFile.test") public void testMoveDeclarationToSeparateFile_moveClassToFile_MoveClassToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveClassToFile/moveClassToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveClassToFile/moveClassToFile.test"); doTest(fileName); } @TestMetadata("moveDeclarationToSeparateFile/moveSingleToFile/moveSingleToFile.test") public void testMoveDeclarationToSeparateFile_moveSingleToFile_MoveSingleToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveSingleToFile/moveSingleToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveDeclarationToSeparateFile/moveSingleToFile/moveSingleToFile.test"); doTest(fileName); } @TestMetadata("moveFileToPackageMatchingDirectory/moveToDefaultDirectory/moveToDefaultDirectory.test") public void testMoveFileToPackageMatchingDirectory_moveToDefaultDirectory_MoveToDefaultDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToDefaultDirectory/moveToDefaultDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToDefaultDirectory/moveToDefaultDirectory.test"); doTest(fileName); } @TestMetadata("moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/moveToNonDefaultDirectory.test") public void testMoveFileToPackageMatchingDirectory_moveToNonDefaultDirectory_MoveToNonDefaultDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/moveToNonDefaultDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/moveToNonDefaultDirectory/moveToNonDefaultDirectory.test"); doTest(fileName); } @TestMetadata("moveFileToPackageMatchingDirectory/packageMatchesDirectory/packageMatchesDirectory.test") public void testMoveFileToPackageMatchingDirectory_packageMatchesDirectory_PackageMatchesDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/packageMatchesDirectory/packageMatchesDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/moveFileToPackageMatchingDirectory/packageMatchesDirectory/packageMatchesDirectory.test"); doTest(fileName); } @TestMetadata("reconcilePackageWithDirectory/changeToDefaultPackage/changeToDefaultPackage.test") public void testReconcilePackageWithDirectory_changeToDefaultPackage_ChangeToDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/changeToDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToDefaultPackage/changeToDefaultPackage.test"); doTest(fileName); } @TestMetadata("reconcilePackageWithDirectory/changeToNonDefaultPackage/changeToNonDefaultPackage.test") public void testReconcilePackageWithDirectory_changeToNonDefaultPackage_ChangeToNonDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/changeToNonDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/changeToNonDefaultPackage/changeToNonDefaultPackage.test"); doTest(fileName); } @TestMetadata("reconcilePackageWithDirectory/packageMatchesDirectory/packageMatchesDirectory.test") public void testReconcilePackageWithDirectory_packageMatchesDirectory_PackageMatchesDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/packageMatchesDirectory/packageMatchesDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileIntentions/reconcilePackageWithDirectory/packageMatchesDirectory/packageMatchesDirectory.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java index 917eb4c6f59..9bea3f68313 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JoinLinesTestGenerated extends AbstractJoinLinesTest { public void testAllFilesPresentInJoinLines() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/joinLines/declarationAndAssignment") @@ -40,108 +40,108 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationAndAssignment extends AbstractJoinLinesTest { public void testAllFilesPresentInDeclarationAndAssignment() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/declarationAndAssignment"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/declarationAndAssignment"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("blankLineBetween.kt") public void testBlankLineBetween() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/blankLineBetween.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/blankLineBetween.kt"); doTest(fileName); } @TestMetadata("commentBetween.kt") public void testCommentBetween() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/commentBetween.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/commentBetween.kt"); doTest(fileName); } @TestMetadata("longInit.kt") public void testLongInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/longInit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/longInit.kt"); doTest(fileName); } @TestMetadata("longInit2.kt") public void testLongInit2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/longInit2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/longInit2.kt"); doTest(fileName); } @TestMetadata("propertyWithAnnotation.kt") public void testPropertyWithAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/propertyWithAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/propertyWithAnnotation.kt"); doTest(fileName); } @TestMetadata("simpleInit.kt") public void testSimpleInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInit.kt"); doTest(fileName); } @TestMetadata("simpleInit2.kt") public void testSimpleInit2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInit2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInit2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithBackticks.kt") public void testSimpleInitWithBackticks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks.kt"); doTest(fileName); } @TestMetadata("simpleInitWithBackticks2.kt") public void testSimpleInitWithBackticks2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithBackticks3.kt") public void testSimpleInitWithBackticks3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithBackticks3.kt"); doTest(fileName); } @TestMetadata("simpleInitWithComments.kt") public void testSimpleInitWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments.kt"); doTest(fileName); } @TestMetadata("simpleInitWithComments2.kt") public void testSimpleInitWithComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithComments2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithSemicolons.kt") public void testSimpleInitWithSemicolons() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons.kt"); doTest(fileName); } @TestMetadata("simpleInitWithSemicolons2.kt") public void testSimpleInitWithSemicolons2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons2.kt"); doTest(fileName); } @TestMetadata("simpleInitWithSemicolons3.kt") public void testSimpleInitWithSemicolons3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithSemicolons3.kt"); doTest(fileName); } @TestMetadata("simpleInitWithType.kt") public void testSimpleInitWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithType.kt"); doTest(fileName); } @TestMetadata("simpleInitWithType2.kt") public void testSimpleInitWithType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/declarationAndAssignment/simpleInitWithType2.kt"); doTest(fileName); } } @@ -151,42 +151,42 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest { @RunWith(JUnit3RunnerWithInners.class) public static class NestedIfs extends AbstractJoinLinesTest { public void testAllFilesPresentInNestedIfs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/nestedIfs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/nestedIfs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("BlockBody.kt") public void testBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/BlockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/BlockBody.kt"); doTest(fileName); } @TestMetadata("ComplexCondition1.kt") public void testComplexCondition1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/ComplexCondition1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/ComplexCondition1.kt"); doTest(fileName); } @TestMetadata("ComplexCondition2.kt") public void testComplexCondition2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/ComplexCondition2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/ComplexCondition2.kt"); doTest(fileName); } @TestMetadata("InnerWithElse.kt") public void testInnerWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/InnerWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/InnerWithElse.kt"); doTest(fileName); } @TestMetadata("OuterWithElse.kt") public void testOuterWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/OuterWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/OuterWithElse.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/Simple.kt"); doTest(fileName); } } @@ -196,96 +196,96 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveBraces extends AbstractJoinLinesTest { public void testAllFilesPresentInRemoveBraces() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/removeBraces"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines/removeBraces"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CommentAfterStatement.kt") public void testCommentAfterStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentAfterStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentAfterStatement.kt"); doTest(fileName); } @TestMetadata("CommentAfterStatement2.kt") public void testCommentAfterStatement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentAfterStatement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentAfterStatement2.kt"); doTest(fileName); } @TestMetadata("CommentBeforeStatement.kt") public void testCommentBeforeStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentBeforeStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentBeforeStatement.kt"); doTest(fileName); } @TestMetadata("CommentBeforeStatement2.kt") public void testCommentBeforeStatement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/CommentBeforeStatement2.kt"); doTest(fileName); } @TestMetadata("DoWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/DoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/DoWhile.kt"); doTest(fileName); } @TestMetadata("Else.kt") public void testElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/Else.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/Else.kt"); doTest(fileName); } @TestMetadata("For.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/For.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/For.kt"); doTest(fileName); } @TestMetadata("FunctionBody.kt") public void testFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/FunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/FunctionBody.kt"); doTest(fileName); } @TestMetadata("If.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/If.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/If.kt"); doTest(fileName); } @TestMetadata("IfWithElse.kt") public void testIfWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/IfWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/IfWithElse.kt"); doTest(fileName); } @TestMetadata("LambdaBody.kt") public void testLambdaBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/LambdaBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/LambdaBody.kt"); doTest(fileName); } @TestMetadata("NotSingleLineStatement.kt") public void testNotSingleLineStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/NotSingleLineStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/NotSingleLineStatement.kt"); doTest(fileName); } @TestMetadata("TwoStatements.kt") public void testTwoStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/TwoStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/TwoStatements.kt"); doTest(fileName); } @TestMetadata("WhenEntry.kt") public void testWhenEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/WhenEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/WhenEntry.kt"); doTest(fileName); } @TestMetadata("While.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/While.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/joinLines/removeBraces/While.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt b/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt index 4e0a787748a..d08ecadec30 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt @@ -17,16 +17,16 @@ package org.jetbrains.kotlin.idea.internal import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -public abstract class AbstractBytecodeToolWindowTest: JetLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE +public abstract class AbstractBytecodeToolWindowTest: KotlinLightCodeInsightFixtureTestCase() { + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE public fun doTest(testPath: String) { val mainDir = File(testPath) diff --git a/idea/tests/org/jetbrains/kotlin/idea/internal/BytecodeToolWindowTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/internal/BytecodeToolWindowTestGenerated.java index 29bb6222c29..774e0f3040f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/internal/BytecodeToolWindowTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/internal/BytecodeToolWindowTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.internal; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class BytecodeToolWindowTestGenerated extends AbstractBytecodeToolWindowTest { public void testAllFilesPresentInToolWindow() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/internal/toolWindow"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/internal/toolWindow"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("componentInlineFun") public void testComponentInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/componentInlineFun/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/componentInlineFun/"); doTest(fileName); } @TestMetadata("inlineFunctionBodyResolve") public void testInlineFunctionBodyResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionBodyResolve/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionBodyResolve/"); doTest(fileName); } @TestMetadata("inlineFunctionDeep1") public void testInlineFunctionDeep1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionDeep1/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionDeep1/"); doTest(fileName); } @TestMetadata("inlineFunctionDeep2") public void testInlineFunctionDeep2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionDeep2/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionDeep2/"); doTest(fileName); } @TestMetadata("inlineFunctionInfixCall") public void testInlineFunctionInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionInfixCall/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionInfixCall/"); doTest(fileName); } @TestMetadata("inlineFunctionReifiedParam") public void testInlineFunctionReifiedParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionReifiedParam/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/inlineFunctionReifiedParam/"); doTest(fileName); } @TestMetadata("iteratorFun") public void testIteratorFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/iteratorFun/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/iteratorFun/"); doTest(fileName); } @TestMetadata("multipleInlineFunctionCalls") public void testMultipleInlineFunctionCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/multipleInlineFunctionCalls/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/multipleInlineFunctionCalls/"); doTest(fileName); } @TestMetadata("objectInInlineFun") public void testObjectInInlineFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/internal/toolWindow/objectInInlineFun/"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/internal/toolWindow/objectInInlineFun/"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/internal/KotlinJavaScriptRefreshLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/internal/KotlinJavaScriptRefreshLibraryTest.kt index 29375287af7..ce8b3d770b4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/internal/KotlinJavaScriptRefreshLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/internal/KotlinJavaScriptRefreshLibraryTest.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.newvfs.RefreshQueue import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor import org.jetbrains.kotlin.idea.test.configureAs import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.MockLibraryUtil import java.io.File -public class KotlinJavaScriptRefreshLibraryTest : JetLightCodeInsightFixtureTestCase() { +public class KotlinJavaScriptRefreshLibraryTest : KotlinLightCodeInsightFixtureTestCase() { private val TEST_DATA_PATH = "idea/testData/internal" private val TEST_PACKAGE = "test" diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java index d3ecef36734..25c0e3307bc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/KotlinJavaFacadeTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.asJava.KtLightClass; import org.jetbrains.kotlin.asJava.KtLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.*; @@ -34,7 +34,7 @@ public class KotlinJavaFacadeTest extends KotlinLightCodeInsightFixtureTestCase @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } @Override diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt index 4b52bf1b8e8..1bd91dbcd18 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.idea.kdoc -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils -public abstract class AbstractKDocTypingTest : JetLightCodeInsightFixtureTestCase() { - override fun getTestDataPath(): String = JetTestUtils.getHomeDirectory() - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE +public abstract class AbstractKDocTypingTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE protected fun doTest(fileName: String) { myFixture.configureByFile(fileName) diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java index 3360da92a81..ec6e2225a19 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KDocHighlightingTestGenerated extends AbstractKDocHighlightingTest { public void testAllFilesPresentInHighlighting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/highlighting"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/highlighting"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("UnresolvedReference.kt") public void testUnresolvedReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/highlighting/UnresolvedReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/highlighting/UnresolvedReference.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocTypingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocTypingTestGenerated.java index 2199b9feafc..aea3f51cd82 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocTypingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocTypingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,54 +32,54 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KDocTypingTestGenerated extends AbstractKDocTypingTest { public void testAllFilesPresentInTyping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/typing"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/typing"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("closingBracketNotInLink.kt") public void testClosingBracketNotInLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketNotInLink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketNotInLink.kt"); doTest(fileName); } @TestMetadata("closingBracketOvertype.kt") public void testClosingBracketOvertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketOvertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketOvertype.kt"); doTest(fileName); } @TestMetadata("closingBracketOvertypeEmpty.kt") public void testClosingBracketOvertypeEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketOvertypeEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketOvertypeEmpty.kt"); doTest(fileName); } @TestMetadata("closingBracketRefLinkOvertype.kt") public void testClosingBracketRefLinkOvertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketRefLinkOvertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingBracketRefLinkOvertype.kt"); doTest(fileName); } @TestMetadata("closingParenOvertype.kt") public void testClosingParenOvertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingParenOvertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/closingParenOvertype.kt"); doTest(fileName); } @TestMetadata("openingBracket.kt") public void testOpeningBracket() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingBracket.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingBracket.kt"); doTest(fileName); } @TestMetadata("openingBracketRefLink.kt") public void testOpeningBracketRefLink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingBracketRefLink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingBracketRefLink.kt"); doTest(fileName); } @TestMetadata("openingParen.kt") public void testOpeningParen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingParen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/typing/openingParen.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java index fed2a4da61a..c3433866e2f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,72 +33,72 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KdocResolveTestGenerated extends AbstractReferenceResolveTest { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/resolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/kdoc/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguousReference.kt") public void testAmbiguousReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/AmbiguousReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/AmbiguousReference.kt"); doTest(fileName); } @TestMetadata("AmbiguousReferenceTypeParameter.kt") public void testAmbiguousReferenceTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/AmbiguousReferenceTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/AmbiguousReferenceTypeParameter.kt"); doTest(fileName); } @TestMetadata("ClassSelfReference.kt") public void testClassSelfReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ClassSelfReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ClassSelfReference.kt"); doTest(fileName); } @TestMetadata("CodeReference.kt") public void testCodeReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/CodeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/CodeReference.kt"); doTest(fileName); } @TestMetadata("ConstructorParamReference.kt") public void testConstructorParamReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ConstructorParamReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ConstructorParamReference.kt"); doTest(fileName); } @TestMetadata("ImportedClassReference.kt") public void testImportedClassReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ImportedClassReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ImportedClassReference.kt"); doTest(fileName); } @TestMetadata("ParamReference.kt") public void testParamReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ParamReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/ParamReference.kt"); doTest(fileName); } @TestMetadata("PropertyTypeParamReference.kt") public void testPropertyTypeParamReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/PropertyTypeParamReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/PropertyTypeParamReference.kt"); doTest(fileName); } @TestMetadata("QualifiedCodeReference.kt") public void testQualifiedCodeReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/QualifiedCodeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/QualifiedCodeReference.kt"); doTest(fileName); } @TestMetadata("SeeReference.kt") public void testSeeReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/SeeReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/SeeReference.kt"); doTest(fileName); } @TestMetadata("TypeParamReference.kt") public void testTypeParamReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/kdoc/resolve/TypeParamReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/kdoc/resolve/TypeParamReference.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java index 5355f8219a2..89087531475 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java @@ -24,15 +24,15 @@ import org.jetbrains.kotlin.asJava.KtLightClass; import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.psi.KtClassOrObject; -public class LightClassEqualsTest extends JetLightCodeInsightFixtureTestCase { +public class LightClassEqualsTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } public void testEqualsForExplicitDeclaration() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java index 4920b49f5ea..c4bdc9a1500 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java @@ -20,13 +20,13 @@ import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.KotlinFileType; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.util.List; public abstract class AbstractGotoSuperTest extends LightCodeInsightFixtureTestCase { protected void doTest(String testPath) { - List parts = JetTestUtils.loadBeforeAfterText(testPath); + List parts = KotlinTestUtils.loadBeforeAfterText(testPath); myFixture.configureByText(KotlinFileType.INSTANCE, parts.get(0)); diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt index 25aed4f67f0..ca598b1b2ba 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt @@ -20,12 +20,12 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.testFramework.LightCodeInsightTestCase import com.intellij.testFramework.LightPlatformCodeInsightTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public abstract class AbstractKotlinGotoImplementationTest : LightCodeInsightTestCase() { - override fun getTestDataPath(): String = JetTestUtils.getHomeDirectory() + File.separator + override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + File.separator override fun getProjectJDK(): Sdk = PluginTestCaseBase.mockJdk() diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index 80e7abd7196..f0b377cfa59 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java @@ -30,7 +30,7 @@ import kotlin.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.ReferenceUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public abstract class AbstractKotlinGotoTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractKotlinGotoTest extends KotlinLightCodeInsightFixtureTestCase { protected void doSymbolTest(String path) { myFixture.configureByFile(path); assertGotoSymbol(new GotoSymbolModel2(getProject()), myFixture.getEditor()); diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java index f0f5a8b1cbf..e54aac3bd68 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,72 +32,72 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class GotoSuperTestGenerated extends AbstractGotoSuperTest { public void testAllFilesPresentInGotoSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true); } @TestMetadata("ClassSimple.test") public void testClassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ClassSimple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ClassSimple.test"); doTest(fileName); } @TestMetadata("DelegatedFun.test") public void testDelegatedFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedFun.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedFun.test"); doTest(fileName); } @TestMetadata("DelegatedProperty.test") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedProperty.test"); doTest(fileName); } @TestMetadata("FakeOverrideFun.test") public void testFakeOverrideFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFun.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFun.test"); doTest(fileName); } @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.test") public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFunWithMostRelevantImplementation.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFunWithMostRelevantImplementation.test"); doTest(fileName); } @TestMetadata("FakeOverrideProperty.test") public void testFakeOverrideProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideProperty.test"); doTest(fileName); } @TestMetadata("FunctionSimple.test") public void testFunctionSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FunctionSimple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FunctionSimple.test"); doTest(fileName); } @TestMetadata("ObjectSimple.test") public void testObjectSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ObjectSimple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ObjectSimple.test"); doTest(fileName); } @TestMetadata("PropertySimple.test") public void testPropertySimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/PropertySimple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/PropertySimple.test"); doTest(fileName); } @TestMetadata("SuperWithNativeToGenericMapping.test") public void testSuperWithNativeToGenericMapping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/SuperWithNativeToGenericMapping.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/SuperWithNativeToGenericMapping.test"); doTest(fileName); } @TestMetadata("TraitSimple.test") public void testTraitSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/TraitSimple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/TraitSimple.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java index 1f2a639b557..c874b7a7bce 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationMultifileTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.navigation.GotoTargetHandler; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import java.io.File; @@ -77,7 +77,7 @@ public class KotlinGotoImplementationMultifileTest extends KotlinLightCodeInsigh @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } private void doMultifileTest(String ... fileNames) throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java index c299685f406..fb87cc7055f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,65 +33,65 @@ import java.util.regex.Pattern; public class KotlinGotoImplementationTestGenerated extends AbstractKotlinGotoImplementationTest { @TestMetadata("AbstractClassImplementorsWithDeclaration.kt") public void testAbstractClassImplementorsWithDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/AbstractClassImplementorsWithDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/AbstractClassImplementorsWithDeclaration.kt"); doTest(fileName); } public void testAllFilesPresentInImplementations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/implementations"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/implementations"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("ClassImplementorsWithDeclaration.kt") public void testClassImplementorsWithDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/ClassImplementorsWithDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/ClassImplementorsWithDeclaration.kt"); doTest(fileName); } @TestMetadata("ClassNavigation.kt") public void testClassNavigation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/ClassNavigation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/ClassNavigation.kt"); doTest(fileName); } @TestMetadata("ConstructorPropertyOverriddenNavigation.kt") public void testConstructorPropertyOverriddenNavigation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt"); doTest(fileName); } @TestMetadata("EnumEntriesInheritance.kt") public void testEnumEntriesInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/EnumEntriesInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/EnumEntriesInheritance.kt"); doTest(fileName); } @TestMetadata("FunctionOverrideNavigation.kt") public void testFunctionOverrideNavigation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/FunctionOverrideNavigation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/FunctionOverrideNavigation.kt"); doTest(fileName); } @TestMetadata("ImplementGenericWithPrimitives.kt") public void testImplementGenericWithPrimitives() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt"); doTest(fileName); } @TestMetadata("OverridesInEnumEntries.kt") public void testOverridesInEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/OverridesInEnumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/OverridesInEnumEntries.kt"); doTest(fileName); } @TestMetadata("PropertyOverriddenNavigation.kt") public void testPropertyOverriddenNavigation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt"); doTest(fileName); } @TestMetadata("TraitImplementorsWithDeclaration.kt") public void testTraitImplementorsWithDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/implementations/TraitImplementorsWithDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/implementations/TraitImplementorsWithDeclaration.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java index 1cfe6b6cb50..8b39af83783 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,54 +34,54 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { @RunWith(JUnit3RunnerWithInners.class) public static class GotoClass extends AbstractKotlinGotoTest { public void testAllFilesPresentInGotoClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/enumEntries.kt"); doClassTest(fileName); } @TestMetadata("inClassObject.kt") public void testInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/inClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/inClassObject.kt"); doClassTest(fileName); } @TestMetadata("innerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/innerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/innerClass.kt"); doClassTest(fileName); } @TestMetadata("localDeclarations.kt") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/localDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/localDeclarations.kt"); doClassTest(fileName); } @TestMetadata("noImplementationTrait.kt") public void testNoImplementationTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/noImplementationTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/noImplementationTrait.kt"); doClassTest(fileName); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleClass.kt"); doClassTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleObject.kt"); doClassTest(fileName); } @TestMetadata("traitWithFunImplement.kt") public void testTraitWithFunImplement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/traitWithFunImplement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/traitWithFunImplement.kt"); doClassTest(fileName); } } @@ -91,42 +91,42 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { @RunWith(JUnit3RunnerWithInners.class) public static class GotoSymbol extends AbstractKotlinGotoTest { public void testAllFilesPresentInGotoSymbol() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functions.kt") public void testFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/functions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/functions.kt"); doSymbolTest(fileName); } @TestMetadata("javaMethods.kt") public void testJavaMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/javaMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/javaMethods.kt"); doSymbolTest(fileName); } @TestMetadata("properties.kt") public void testProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/properties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/properties.kt"); doSymbolTest(fileName); } @TestMetadata("stdLibArrayListOf.kt") public void testStdLibArrayListOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt"); doSymbolTest(fileName); } @TestMetadata("stdLibArrayListOfNoSources.kt") public void testStdLibArrayListOfNoSources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt"); doSymbolTest(fileName); } @TestMetadata("stdLibJoinToString.kt") public void testStdLibJoinToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt"); doSymbolTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java index 47eef14ff3a..0670db544ad 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/ParameterInfoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ParameterInfoTestGenerated extends AbstractParameterInfoTest { public void testAllFilesPresentInParameterInfo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/parameterInfo/arrayAccess") @@ -40,36 +40,36 @@ public class ParameterInfoTestGenerated extends AbstractParameterInfoTest { @RunWith(JUnit3RunnerWithInners.class) public static class ArrayAccess extends AbstractParameterInfoTest { public void testAllFilesPresentInArrayAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Overloads.kt") public void testOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Overloads.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Overloads.kt"); doTest(fileName); } @TestMetadata("Overloads2.kt") public void testOverloads2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Overloads2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Overloads2.kt"); doTest(fileName); } @TestMetadata("Set.kt") public void testSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Set.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Set.kt"); doTest(fileName); } @TestMetadata("SetTooManyArgs.kt") public void testSetTooManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/SetTooManyArgs.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/arrayAccess/Simple.kt"); doTest(fileName); } } @@ -79,216 +79,216 @@ public class ParameterInfoTestGenerated extends AbstractParameterInfoTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionCall extends AbstractParameterInfoTest { public void testAllFilesPresentInFunctionCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionCall"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DefaultValuesFromLib.kt") public void testDefaultValuesFromLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/DefaultValuesFromLib.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Deprecated.kt"); doTest(fileName); } @TestMetadata("ExtensionOnClassObject.kt") public void testExtensionOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/ExtensionOnClassObject.kt"); doTest(fileName); } @TestMetadata("FunctionalValue1.kt") public void testFunctionalValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/FunctionalValue1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/FunctionalValue1.kt"); doTest(fileName); } @TestMetadata("FunctionalValue2.kt") public void testFunctionalValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/FunctionalValue2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/FunctionalValue2.kt"); doTest(fileName); } @TestMetadata("InheritedFunctions.kt") public void testInheritedFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/InheritedFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/InheritedFunctions.kt"); doTest(fileName); } @TestMetadata("InheritedWithCurrentFunctions.kt") public void testInheritedWithCurrentFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt"); doTest(fileName); } @TestMetadata("Invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Invoke.kt"); doTest(fileName); } @TestMetadata("LocalFunctionBug.kt") public void testLocalFunctionBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/LocalFunctionBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/LocalFunctionBug.kt"); doTest(fileName); } @TestMetadata("NamedAndDefaultParameter.kt") public void testNamedAndDefaultParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedAndDefaultParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedAndDefaultParameter.kt"); doTest(fileName); } @TestMetadata("NamedParameter.kt") public void testNamedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedParameter.kt"); doTest(fileName); } @TestMetadata("NamedParameter2.kt") public void testNamedParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NamedParameter2.kt"); doTest(fileName); } @TestMetadata("NoAnnotations.kt") public void testNoAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NoAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NoAnnotations.kt"); doTest(fileName); } @TestMetadata("NoSynthesizedParameterNames.kt") public void testNoSynthesizedParameterNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NoSynthesizedParameterNames.kt"); doTest(fileName); } @TestMetadata("NotAccessible.kt") public void testNotAccessible() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NotAccessible.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NotAccessible.kt"); doTest(fileName); } @TestMetadata("NotGreen.kt") public void testNotGreen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NotGreen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NotGreen.kt"); doTest(fileName); } @TestMetadata("NullableTypeCall.kt") public void testNullableTypeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NullableTypeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/NullableTypeCall.kt"); doTest(fileName); } @TestMetadata("OtherConstructorFromSecondary.kt") public void testOtherConstructorFromSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/OtherConstructorFromSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/OtherConstructorFromSecondary.kt"); doTest(fileName); } @TestMetadata("Println.kt") public void testPrintln() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Println.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Println.kt"); doTest(fileName); } @TestMetadata("PrivateConstructor.kt") public void testPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/PrivateConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/PrivateConstructor.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/Simple.kt"); doTest(fileName); } @TestMetadata("SimpleConstructor.kt") public void testSimpleConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SimpleConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SimpleConstructor.kt"); doTest(fileName); } @TestMetadata("SubstituteExpectedType.kt") public void testSubstituteExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteExpectedType.kt"); doTest(fileName); } @TestMetadata("SubstituteExplicitTypeArgs.kt") public void testSubstituteExplicitTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt"); doTest(fileName); } @TestMetadata("SubstituteFromArguments1.kt") public void testSubstituteFromArguments1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt"); doTest(fileName); } @TestMetadata("SubstituteFromArguments2.kt") public void testSubstituteFromArguments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments2.kt"); doTest(fileName); } @TestMetadata("SubstituteFromArguments3.kt") public void testSubstituteFromArguments3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments3.kt"); doTest(fileName); } @TestMetadata("SubstituteFromArguments4.kt") public void testSubstituteFromArguments4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArguments4.kt"); doTest(fileName); } @TestMetadata("SubstituteFromArgumentsOnTyping.kt") public void testSubstituteFromArgumentsOnTyping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SubstituteFromArgumentsOnTyping.kt"); doTest(fileName); } @TestMetadata("SuperConstructorCall.kt") public void testSuperConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SuperConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SuperConstructorCall.kt"); doTest(fileName); } @TestMetadata("SuperConstructorFromSecondary.kt") public void testSuperConstructorFromSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SuperConstructorFromSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/SuperConstructorFromSecondary.kt"); doTest(fileName); } @TestMetadata("TooManyArgs.kt") public void testTooManyArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TooManyArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TooManyArgs.kt"); doTest(fileName); } @TestMetadata("TwoFunctions.kt") public void testTwoFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TwoFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TwoFunctions.kt"); doTest(fileName); } @TestMetadata("TwoFunctionsGrey.kt") public void testTwoFunctionsGrey() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt"); doTest(fileName); } @TestMetadata("UpdateOnTyping.kt") public void testUpdateOnTyping() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/UpdateOnTyping.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/parameterInfo/functionCall/UpdateOnTyping.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 86a1ce7ba60..4e84aca34a8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.FilenameFilter; @@ -126,10 +126,10 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer protected void doMultiFileTest(final String beforeFileName) throws Exception { String multifileText = FileUtil.loadFile(new File(beforeFileName), true); - final List subFiles = JetTestUtils.createTestFiles( + final List subFiles = KotlinTestUtils.createTestFiles( "single.kt", multifileText, - new JetTestUtils.TestFileFactoryNoModules() { + new KotlinTestUtils.TestFileFactoryNoModules() { @NotNull @Override public TestFile create(@NotNull String fileName, @NotNull String text, @NotNull Map directives) { @@ -196,7 +196,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer } actualTestFile.append("// FILE: ").append(afterFile.name).append("\n").append(afterText); - JetTestUtils.assertEqualsToFile(new File(beforeFileName), actualTestFile.toString()); + KotlinTestUtils.assertEqualsToFile(new File(beforeFileName), actualTestFile.toString()); } } catch (ComparisonFailure e) { @@ -281,7 +281,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer checkResultByFile(afterFilePath); } catch (ComparisonFailure e) { - JetTestUtils.assertEqualsToFile(new File(afterFilePath), getEditor()); + KotlinTestUtils.assertEqualsToFile(new File(afterFilePath), getEditor()); } PsiFile mainFile = myFile; @@ -376,7 +376,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer @Override protected String getTestDataPath() { - return JetTestUtils.getHomeDirectory() + "/"; + return KotlinTestUtils.getHomeDirectory() + "/"; } @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt index b99c0ab19ec..a50c081de25 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix import org.jetbrains.kotlin.idea.quickfix.replaceWith.ReplaceWith -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.test.JUnit3RunnerWithInners -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestMetadata import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.junit.runner.RunWith @@ -33,8 +33,8 @@ import org.junit.runner.RunWith @TestMetadata("idea/testData/quickfix.special") @TestDataPath("\$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners::class) -public class DeprecatedSymbolUsageFixSpecialTest : JetLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() +public class DeprecatedSymbolUsageFixSpecialTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() override fun getProjectDescriptor() = ProjectDescriptorWithStdlibSources.INSTANCE private val TEST_DATA_DIR = "idea/testData/quickfix.special/deprecatedSymbolUsage" @@ -48,7 +48,7 @@ public class DeprecatedSymbolUsageFixSpecialTest : JetLightCodeInsightFixtureTes } private fun doTest(pattern: String) { - val testPath = JetTestUtils.navigationMetadata(TEST_DATA_DIR + "/" + getTestName(true) + ".kt") + val testPath = KotlinTestUtils.navigationMetadata(TEST_DATA_DIR + "/" + getTestName(true) + ".kt") myFixture.configureByFile(testPath) val offset = getEditor().caretModel.offset diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index 85c64a40e33..a8fd6ccc806 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInQuickfix() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/addStarProjections") @@ -40,7 +40,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddStarProjections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } @@ -50,366 +50,366 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class AutoImports extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAutoImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("ambiguousNamePreferFromJdk.before.Main.kt") public void testAmbiguousNamePreferFromJdk() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/ambiguousNamePreferFromJdk.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("ambiguousNamePreferWithImportsFromPackage.before.Main.kt") public void testAmbiguousNamePreferWithImportsFromPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/ambiguousNamePreferWithImportsFromPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/ambiguousNamePreferWithImportsFromPackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callableReferenceExtension.before.Main.kt") public void testCallableReferenceExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceExtension.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callableReferenceTopLevel.before.Main.kt") public void testCallableReferenceTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/callableReferenceTopLevel.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classImport.before.Main.kt") public void testClassImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/classImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/classImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("delegateExtensionBoth.test") public void testDelegateExtensionBoth() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionBoth.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionBoth.test"); doTestWithExtraFile(fileName); } @TestMetadata("delegateExtensionGet.test") public void testDelegateExtensionGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionGet.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionGet.test"); doTestWithExtraFile(fileName); } @TestMetadata("delegateExtensionSet.test") public void testDelegateExtensionSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionSet.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/delegateExtensionSet.test"); doTestWithExtraFile(fileName); } @TestMetadata("divOperator.before.Main.kt") public void testDivOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/divOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/divOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionFunctionImport.before.Main.kt") public void testExtensionFunctionImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionFunctionImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionFunctionImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionFunctionImportImplicitReceiver.before.Main.kt") public void testExtensionFunctionImportImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionFunctionImportImplicitReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionPropertyImport.before.Main.kt") public void testExtensionPropertyImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionPropertyImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionPropertyImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("factoryFunctionFromLambda.before.Main.kt") public void testFactoryFunctionFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/factoryFunctionFromLambda.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("falsePostfixOperator.before.Main.kt") public void testFalsePostfixOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("functionImport.before.Main.kt") public void testFunctionImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/functionImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/functionImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("importInFirstPartInQualifiedExpression.before.Main.kt") public void testImportInFirstPartInQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("importInFirstPartInUserType.test") public void testImportInFirstPartInUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInUserType.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInUserType.test"); doTestWithExtraFile(fileName); } @TestMetadata("importTrait.before.Main.kt") public void testImportTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importTrait.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importTrait.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("indexCallExtensionGet.test") public void testIndexCallExtensionGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionGet.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionGet.test"); doTestWithExtraFile(fileName); } @TestMetadata("indexCallExtensionGetNoOperator.test") public void testIndexCallExtensionGetNoOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test"); doTestWithExtraFile(fileName); } @TestMetadata("indexCallExtensionSet.test") public void testIndexCallExtensionSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionSet.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallExtensionSet.test"); doTestWithExtraFile(fileName); } @TestMetadata("indexCallNoImportWhenGetNeededButSetAvailable.test") public void testIndexCallNoImportWhenGetNeededButSetAvailable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test"); doTestWithExtraFile(fileName); } @TestMetadata("indexCallNoImportWhenSetNeededButGetAvailable.test") public void testIndexCallNoImportWhenSetNeededButGetAvailable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test"); doTestWithExtraFile(fileName); } @TestMetadata("infixCall.before.Main.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("infixCall2.before.Main.kt") public void testInfixCall2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall2.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall2.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("invokeExtension.test") public void testInvokeExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/invokeExtension.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/invokeExtension.test"); doTestWithExtraFile(fileName); } @TestMetadata("invokeExtensionNoOperator.test") public void testInvokeExtensionNoOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test"); doTestWithExtraFile(fileName); } @TestMetadata("minusOperator.before.Main.kt") public void testMinusOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/minusOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/minusOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionAllComponents.test") public void testMultiDeclarationExtensionAllComponents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionAllComponentsMany.test") public void testMultiDeclarationExtensionAllComponentsMany() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionAllComponentsPrefereFull.test") public void testMultiDeclarationExtensionAllComponentsPrefereFull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test") public void testMultiDeclarationExtensionAllComponentsPrefereNotDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionComponent1.test") public void testMultiDeclarationExtensionComponent1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionComponent2.test") public void testMultiDeclarationExtensionComponent2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test"); doTestWithExtraFile(fileName); } @TestMetadata("multiDeclarationExtensionComponentNoOperator.test") public void testMultiDeclarationExtensionComponentNoOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test"); doTestWithExtraFile(fileName); } @TestMetadata("nestedClass.before.Main.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/nestedClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/nestedClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportForFunInQualifiedNotFirst.before.Main.kt") public void testNoImportForFunInQualifiedNotFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportForNestedInPrivate.before.Main.kt") public void testNoImportForNestedInPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForNestedInPrivate.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportForPrivateClass.before.Main.kt") public void testNoImportForPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportInImports.before.Main.kt") public void testNoImportInImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportInQualifiedExpressionNotFirst.before.Main.kt") public void testNoImportInQualifiedExpressionNotFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportInQualifiedUserTypeNotFirst.before.Main.kt") public void testNoImportInQualifiedUserTypeNotFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportInSafeQualifiedExpressionNotFirst.before.Main.kt") public void testNoImportInSafeQualifiedExpressionNotFirst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportsForClassInExcludedPackage.before.Main.kt") public void testNoImportsForClassInExcludedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForClassInExcludedPackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportsForExcludedClass.before.Main.kt") public void testNoImportsForExcludedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForExcludedClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noImportsForFunctionInExcludedPackage.before.Main.kt") public void testNoImportsForFunctionInExcludedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportsForFunctionInExcludedPackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("notExcludedClass.before.Main.kt") public void testNotExcludedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/notExcludedClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/notExcludedClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("objectImport.before.Main.kt") public void testObjectImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/objectImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/objectImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("operatorAssignPlus.test") public void testOperatorAssignPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlus.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlus.test"); doTestWithExtraFile(fileName); } @TestMetadata("operatorAssignPlusAssign.test") public void testOperatorAssignPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test"); doTestWithExtraFile(fileName); } @TestMetadata("operatorAssignPlusTwoVariantsDifferentPackages.test") public void testOperatorAssignPlusTwoVariantsDifferentPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test"); doTestWithExtraFile(fileName); } @TestMetadata("packageClass.before.Main.kt") public void testPackageClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/packageClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/packageClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("plusOperator.before.Main.kt") public void testPlusOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/plusOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/plusOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("postfixOperator.before.Main.kt") public void testPostfixOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/postfixOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/postfixOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("propertyImport.before.Main.kt") public void testPropertyImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/propertyImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/propertyImport.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("sameModuleImportPriority.before.Main.kt") public void testSameModuleImportPriority() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sameModuleImportPriority.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sameModuleImportPriority.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("timesAssign.before.Main.kt") public void testTimesAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/timesAssign.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/timesAssign.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("unaryMinusOperator.before.Main.kt") public void testUnaryMinusOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("unaryPlusOperator.before.Main.kt") public void testUnaryPlusOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("withSmartCastQualifier.before.Main.kt") public void testWithSmartCastQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/withSmartCastQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/withSmartCastQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -420,29 +420,29 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public static class ChangeSignature extends AbstractQuickFixMultiFileTest { @TestMetadata("addJavaMethodParameter.before.Main.kt") public void testAddJavaMethodParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addJavaMethodParameter.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addJavaMethodParameter.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("addParameterWithImport.before.Main.kt") public void testAddParameterWithImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt"); doTestWithExtraFile(fileName); } public void testAllFilesPresentInChangeSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("matchFunctionLiteralWithSAMType.before.Main.kt") public void testMatchFunctionLiteralWithSAMType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("removeJavaMethodParameter.before.Main.kt") public void testRemoveJavaMethodParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeJavaMethodParameter.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeJavaMethodParameter.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -452,7 +452,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CheckArguments extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCheckArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } @@ -462,7 +462,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createClass") @@ -470,7 +470,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CreateClass extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry") @@ -478,24 +478,24 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationEntry extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAnnotationEntry() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("nestedGroovyAnnotation.before.Main.kt") public void testNestedGroovyAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedGroovyAnnotation.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("nestedJavaAnnotation.before.Main.kt") public void testNestedJavaAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotation.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("nestedJavaAnnotationWithNamedArgs.before.Main.kt") public void testNestedJavaAnnotationWithNamedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/nestedJavaAnnotationWithNamedArgs.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -505,72 +505,72 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CallExpression extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("callInAnnotationEntryWithJavaQualifier.before.Main.kt") public void testCallInAnnotationEntryWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntryWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithExplicitParamNamesAndJavaQualifier.before.Main.kt") public void testCallWithExplicitParamNamesAndJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNamesAndJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithFinalJavaSupertype.before.Main.kt") public void testCallWithFinalJavaSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalJavaSupertype.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithGenericJavaReceiver.before.Main.kt") public void testCallWithGenericJavaReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithGroovyClassQualifier.before.Main.kt") public void testCallWithGroovyClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGroovyClassQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGroovyClassQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithJavaClassQualifier.before.Main.kt") public void testCallWithJavaClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithJavaClassReceiver.before.Main.kt") public void testCallWithJavaClassReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithJavaQualifierInMemberValDelegate.before.Main.kt") public void testCallWithJavaQualifierInMemberValDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaQualifierInMemberValDelegate.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithSuperclassAndJavaReceiverNoConstructorParams.before.Main.kt") public void testCallWithSuperclassAndJavaReceiverNoConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassAndJavaReceiverNoConstructorParams.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithSuperclassConstructorParamsAndJavaReceiver.before.Main.kt") public void testCallWithSuperclassConstructorParamsAndJavaReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassConstructorParamsAndJavaReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("callWithSupertraitAndJavaReceiver.before.Main.kt") public void testCallWithSupertraitAndJavaReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertraitAndJavaReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @@ -579,36 +579,36 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("javaClassMember.before.Main.kt") public void testJavaClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberInner.before.Main.kt") public void testJavaClassMemberInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberInnerPartialSubstitution.before.Main.kt") public void testJavaClassMemberInnerPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberInnerWithReceiverArg.before.Main.kt") public void testJavaClassMemberInnerWithReceiverArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberPartialSubstitution.before.Main.kt") public void testJavaClassMemberPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -619,30 +619,30 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class DelegationSpecifier extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInDelegationSpecifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("delegatorToNestedJavaSupercall.before.Main.kt") public void testDelegatorToNestedJavaSupercall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercall.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("delegatorToNestedJavaSupercallWithParamNames.before.Main.kt") public void testDelegatorToNestedJavaSupercallWithParamNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToNestedJavaSupercallWithParamNames.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("traitDelegatorToNestedGroovySuperclass.before.Main.kt") public void testTraitDelegatorToNestedGroovySuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedGroovySuperclass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("traitDelegatorToNestedJavaSuperclass.before.Main.kt") public void testTraitDelegatorToNestedJavaSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToNestedJavaSuperclass.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -652,48 +652,48 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class ImportDirective extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInImportDirective() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("annotationWithJavaQualifier.before.Main.kt") public void testAnnotationWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classWithGroovyQualifier.before.Main.kt") public void testClassWithGroovyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithGroovyQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithGroovyQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classWithJavaQualifier.before.Main.kt") public void testClassWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryInJavaEnum.before.Main.kt") public void testEnumEntryInJavaEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInJavaEnum.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumWithJavaQualifier.before.Main.kt") public void testEnumWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("objectWithJavaQualifier.before.Main.kt") public void testObjectWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("traitWithJavaQualifier.before.Main.kt") public void testTraitWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -703,60 +703,60 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class ReferenceExpression extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInReferenceExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("classByNestedGroovyQualifier.before.Main.kt") public void testClassByNestedGroovyQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedGroovyQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedGroovyQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classByNestedJavaQualifier.before.Main.kt") public void testClassByNestedJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumByNestedJavaQualifier.before.Main.kt") public void testEnumByNestedJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByNestedJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryWithJavaEnumQualifier.before.Main.kt") public void testEnumEntryWithJavaEnumQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryWithJavaEnumSuperclass.before.Main.kt") public void testEnumEntryWithJavaEnumSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryWithJavaNonEnumQualifier.before.Main.kt") public void testEnumEntryWithJavaNonEnumQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryWithJavaNonEnumSuperclass.before.Main.kt") public void testEnumEntryWithJavaNonEnumSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("objectWithJavaQualifier.before.Main.kt") public void testObjectWithJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("traitByNestedJavaQualifier.before.Main.kt") public void testTraitByNestedJavaQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByNestedJavaQualifier.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -766,42 +766,42 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeReference extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("annotationJavaTypeReceiver.before.Main.kt") public void testAnnotationJavaTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationJavaTypeReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classGroovyTypeReceiver.before.Main.kt") public void testClassGroovyTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classGroovyTypeReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classGroovyTypeReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("classJavaTypeReceiver.before.Main.kt") public void testClassJavaTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classJavaTypeReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumEntryJavaEnumReceiver.before.Main.kt") public void testEnumEntryJavaEnumReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryJavaEnumReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("enumJavaTypeReceiver.before.Main.kt") public void testEnumJavaTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumJavaTypeReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("traitJavaTypeReceiver.before.Main.kt") public void testTraitJavaTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/traitJavaTypeReceiver.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -812,7 +812,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CreateFunction extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction/call") @@ -820,66 +820,66 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Call extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("extensionFunOnGroovyType.before.Main.kt") public void testExtensionFunOnGroovyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionFunOnJavaType.before.Main.kt") public void testExtensionFunOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionFunOnTypeFromAnotherPackage.before.Main.kt") public void testExtensionFunOnTypeFromAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("funOnGroovyType.before.Main.kt") public void testFunOnGroovyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("funOnJavaInterface.before.Main.kt") public void testFunOnJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("funOnJavaType.before.Main.kt") public void testFunOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("genericFunOnJavaType.before.Main.kt") public void testGenericFunOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticExtensionFunOnJavaClass.before.Main.kt") public void testStaticExtensionFunOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticFunOnJavaClass.before.Main.kt") public void testStaticFunOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticFunOnJavaInterface.before.Main.kt") public void testStaticFunOnJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt"); doTestWithExtraFile(fileName); } @@ -888,24 +888,24 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("javaClassMember.before.Main.kt") public void testJavaClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberPartialSubstitution.before.Main.kt") public void testJavaClassMemberPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaClassMemberWithReceiverArg.before.Main.kt") public void testJavaClassMemberWithReceiverArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -918,30 +918,30 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CreateSecondaryConstructor extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateSecondaryConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("delegatorToSuperCallJavaClass.before.Main.kt") public void testDelegatorToSuperCallJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("groovyConstructor.before.Main.kt") public void testGroovyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/groovyConstructor.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/groovyConstructor.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("javaConstructor.before.Main.kt") public void testJavaConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/javaConstructor.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("superCallJavaClass.before.Main.kt") public void testSuperCallJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -951,7 +951,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class CreateVariable extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter") @@ -959,12 +959,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("platformType.before.Main.kt") public void testPlatformType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/platformType.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -974,18 +974,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class PrimaryParameter extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInPrimaryParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("staticValOnJavaClass.before.Main.kt") public void testStaticValOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("valOnJavaType.before.Main.kt") public void testValOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -995,72 +995,72 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("extensionPropertyOnTypeFromAnotherPackage.before.Main.kt") public void testExtensionPropertyOnTypeFromAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionValOnGroovyType.before.Main.kt") public void testExtensionValOnGroovyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("extensionValOnJavaType.before.Main.kt") public void testExtensionValOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticExtensionValOnJavaType.before.Main.kt") public void testStaticExtensionValOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticValOnJavaClass.before.Main.kt") public void testStaticValOnJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticValOnJavaInterface.before.Main.kt") public void testStaticValOnJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("staticVarOnJavaInterface.before.Main.kt") public void testStaticVarOnJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/staticVarOnJavaInterface.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("valOnGroovyType.before.Main.kt") public void testValOnGroovyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnGroovyType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("valOnJavaInterface.before.Main.kt") public void testValOnJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaInterface.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("valOnJavaType.before.Main.kt") public void testValOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("varOnJavaType.before.Main.kt") public void testVarOnJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1072,18 +1072,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedSymbolUsage extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInDeprecatedSymbolUsage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("javaDeprecated.before.Main.kt") public void testJavaDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("toMethodFromCompanionObject.before.Main.kt") public void testToMethodFromCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.before.Main.kt"); doTestWithExtraFile(fileName); } @@ -1093,12 +1093,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public static class ClassUsages extends AbstractQuickFixMultiFileTest { @TestMetadata("addImportFromSamePackage.before.Main.kt") public void testAddImportFromSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/addImportFromSamePackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/addImportFromSamePackage.before.Main.kt"); doTestWithExtraFile(fileName); } public void testAllFilesPresentInClassUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject") @@ -1106,12 +1106,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class WholeProject extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInWholeProject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("annotation.before.Main.kt") public void testAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/annotation.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1123,35 +1123,35 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public static class Imports extends AbstractQuickFixMultiFileTest { @TestMetadata("addImportFromSamePackage.before.Main.kt") public void testAddImportFromSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("addImportFromSamePackage2.before.Main.kt") public void testAddImportFromSamePackage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage2.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage2.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("addImportFromSamePackage3.before.Main.kt") public void testAddImportFromSamePackage3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage3.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportFromSamePackage3.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("addImports.before.Main.kt") public void testAddImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImports.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImports.before.Main.kt"); doTestWithExtraFile(fileName); } public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/imports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/imports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("rootPackage.before.Main.kt") public void testRootPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/rootPackage.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/rootPackage.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1161,12 +1161,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("platformType.before.Main.kt") public void testPlatformType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/platformType.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/platformType.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1176,18 +1176,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class WholeProject extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInWholeProject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("function.before.Main.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject/function.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject/function.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("property.before.Main.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject/property.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/wholeProject/property.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1198,7 +1198,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Migration extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInMigration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/migration/conflictingExtension") @@ -1206,18 +1206,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class ConflictingExtension extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInConflictingExtension() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/conflictingExtension"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/conflictingExtension"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("removeImports.before.Main.kt") public void testRemoveImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/removeImports.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/removeImports.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("removeImportsOverloads.before.Main.kt") public void testRemoveImportsOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/removeImportsOverloads.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1227,18 +1227,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedObjectInstanceField extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInDeprecatedObjectInstanceField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/deprecatedObjectInstanceField"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/deprecatedObjectInstanceField"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("basic.before.Main.java") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedObjectInstanceField/basic.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedObjectInstanceField/basic.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("staticImport.before.Main.java") public void testStaticImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedObjectInstanceField/staticImport.before.Main.java"); doTestWithExtraFile(fileName); } } @@ -1248,72 +1248,72 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class DeprecatedStaticField extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInDeprecatedStaticField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/deprecatedStaticField"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/deprecatedStaticField"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("cleanUp.before.Main.java") public void testCleanUp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/cleanUp.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/cleanUp.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfClass_const.before.Main.java") public void testCompanionObjectOfClass_const() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_const.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_const.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfClass_getterReference.before.Main.java") public void testCompanionObjectOfClass_getterReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_getterReference.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_getterReference.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfClass_jvmField.before.Main.java") public void testCompanionObjectOfClass_jvmField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_jvmField.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfClass_jvmField.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfInterface_const.before.Main.java") public void testCompanionObjectOfInterface_const() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_const.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_const.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfInterface_getterReference.before.Main.java") public void testCompanionObjectOfInterface_getterReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_getterReference.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_getterReference.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("companionObjectOfInterface_jvmField_unavailable.before.Main.java") public void testCompanionObjectOfInterface_jvmField_unavailable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_jvmField_unavailable.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/companionObjectOfInterface_jvmField_unavailable.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("object_const.before.Main.java") public void testObject_const() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_const.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_const.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("object_const_unavailable.before.Main.java") public void testObject_const_unavailable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_const_unavailable.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_const_unavailable.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("object_getterReference.before.Main.java") public void testObject_getterReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_getterReference.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_getterReference.before.Main.java"); doTestWithExtraFile(fileName); } @TestMetadata("object_jvmField.before.Main.java") public void testObject_jvmField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_jvmField.before.Main.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/deprecatedStaticField/object_jvmField.before.Main.java"); doTestWithExtraFile(fileName); } } @@ -1323,24 +1323,24 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaAnnotationPositionedArguments extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInJavaAnnotationPositionedArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/javaAnnotationPositionedArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/javaAnnotationPositionedArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("basicMultiple.before.Main.kt") public void testBasicMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/basicMultiple.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("noValueForArgumentMultiple.before.Main.kt") public void testNoValueForArgumentMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/noValueForArgumentMultiple.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("wrongTypeMultiple.before.Main.kt") public void testWrongTypeMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/javaAnnotationPositionedArguments/wrongTypeMultiple.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1350,12 +1350,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class MissingConstructorKeyword extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInMissingConstructorKeyword() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/missingConstructorKeyword"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/missingConstructorKeyword"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("manyFilesMuitliple.before.Main.kt") public void testManyFilesMuitliple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/missingConstructorKeyword/manyFilesMuitliple.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1365,12 +1365,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class ObsoleteLabelSyntax extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInObsoleteLabelSyntax() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/obsoleteLabelSyntax"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/obsoleteLabelSyntax"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("manyFilesMuitliple.before.Main.kt") public void testManyFilesMuitliple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/manyFilesMuitliple.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1382,12 +1382,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInModifiers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("constVal.before.Main.kt") public void testConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/constVal.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/constVal.before.Main.kt"); doTestWithExtraFile(fileName); } @@ -1396,7 +1396,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @@ -1404,7 +1404,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @@ -1412,7 +1412,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInJavaCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } @@ -1425,7 +1425,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInNullables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } @@ -1435,7 +1435,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/override/nothingToOverride") @@ -1443,18 +1443,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class NothingToOverride extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInNothingToOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("import.before.Main.kt") public void testImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("twoPackages.before.Main.kt") public void testTwoPackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1466,30 +1466,30 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class PrivateInFiles extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInPrivateInFiles() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/privateInFiles"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/privateInFiles"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("privateTopLevelFunInFile.before.Main.kt") public void testPrivateTopLevelFunInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelFunInFile.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelFunInFile.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("privateTopLevelValInFile.before.Main.kt") public void testPrivateTopLevelValInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelValInFile.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelValInFile.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("privateTopLevelVarInFile.before.Main.kt") public void testPrivateTopLevelVarInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelVarInFile.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelVarInFile.before.Main.kt"); doTestWithExtraFile(fileName); } @TestMetadata("privateTopLevelVarWithSetterInFile.before.Main.kt") public void testPrivateTopLevelVarWithSetterInFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelVarWithSetterInFile.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/privateInFiles/privateTopLevelVarWithSetterInFile.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1499,7 +1499,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInSuppress() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/suppress/forStatement") @@ -1507,7 +1507,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInForStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } @@ -1518,12 +1518,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeImports extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("importFromAnotherFile.before.Main.kt") public void testImportFromAnotherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/importFromAnotherFile.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/importFromAnotherFile.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1533,7 +1533,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeMismatch extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeMismatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("idea/testData/quickfix/typeMismatch/genericVarianceViolation") @@ -1541,12 +1541,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class GenericVarianceViolation extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInGenericVarianceViolation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/genericVarianceViolation"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/genericVarianceViolation"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } @TestMetadata("basicMultiple.before.Main.kt") public void testBasicMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt"); doTestWithExtraFile(fileName); } } @@ -1558,7 +1558,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), true); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 6a7042a13ab..463af3b14b3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class QuickFixTestGenerated extends AbstractQuickFixTest { public void testAllFilesPresentInQuickfix() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/abstract") @@ -41,149 +41,149 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class Abstract extends AbstractQuickFixTest { @TestMetadata("abstractFunctionInNonAbstractClass.kt") public void testAbstractFunctionInNonAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt"); doTest(fileName); } @TestMetadata("abstractFunctionWithBody.kt") public void testAbstractFunctionWithBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody.kt"); doTest(fileName); } @TestMetadata("abstractFunctionWithBody2.kt") public void testAbstractFunctionWithBody2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody2.kt"); doTest(fileName); } @TestMetadata("abstractFunctionWithBody3.kt") public void testAbstractFunctionWithBody3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractFunctionWithBody3.kt"); doTest(fileName); } @TestMetadata("abstractPropertyInNonAbstractClass1.kt") public void testAbstractPropertyInNonAbstractClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt"); doTest(fileName); } @TestMetadata("abstractPropertyInNonAbstractClass2.kt") public void testAbstractPropertyInNonAbstractClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt"); doTest(fileName); } @TestMetadata("abstractPropertyInNonAbstractClass3.kt") public void testAbstractPropertyInNonAbstractClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt"); doTest(fileName); } @TestMetadata("abstractPropertyInPrimaryConstructorParameters.kt") public void testAbstractPropertyInPrimaryConstructorParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyInPrimaryConstructorParameters.kt"); doTest(fileName); } @TestMetadata("abstractPropertyNotInClass.kt") public void testAbstractPropertyNotInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyNotInClass.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWIthInitializer2.kt") public void testAbstractPropertyWIthInitializer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer2.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWIthInitializer3.kt") public void testAbstractPropertyWIthInitializer3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWIthInitializer3.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWithGetter1.kt") public void testAbstractPropertyWithGetter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWithGetter2.kt") public void testAbstractPropertyWithGetter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithGetter2.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWithInitializer1.kt") public void testAbstractPropertyWithInitializer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt"); doTest(fileName); } @TestMetadata("abstractPropertyWithSetter.kt") public void testAbstractPropertyWithSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt"); doTest(fileName); } public void testAllFilesPresentInAbstract() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/abstract"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/abstract"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("manyImpl.kt") public void testManyImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/manyImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/manyImpl.kt"); doTest(fileName); } @TestMetadata("mustBeInitializedOrBeAbstract.kt") public void testMustBeInitializedOrBeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstract.kt"); doTest(fileName); } @TestMetadata("nonAbstractFunctionWithNoBody.kt") public void testNonAbstractFunctionWithNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt"); doTest(fileName); } @TestMetadata("nonMemberAbstractFunction.kt") public void testNonMemberAbstractFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberAbstractFunction.kt"); doTest(fileName); } @TestMetadata("nonMemberFunctionNoBody.kt") public void testNonMemberFunctionNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/nonMemberFunctionNoBody.kt"); doTest(fileName); } @TestMetadata("notImplementedMember.kt") public void testNotImplementedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMember.kt"); doTest(fileName); } @TestMetadata("notImplementedMemberFromAbstractClass.kt") public void testNotImplementedMemberFromAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt"); doTest(fileName); } @TestMetadata("redundantAbstract.kt") public void testRedundantAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/redundantAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/redundantAbstract.kt"); doTest(fileName); } @TestMetadata("replaceOpen.kt") public void testReplaceOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/replaceOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/abstract/replaceOpen.kt"); doTest(fileName); } } @@ -193,42 +193,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddGenericUpperBound extends AbstractQuickFixTest { public void testAllFilesPresentInAddGenericUpperBound() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addGenericUpperBound"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addGenericUpperBound"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/basic.kt"); doTest(fileName); } @TestMetadata("boundAlreadyExists.kt") public void testBoundAlreadyExists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/boundAlreadyExists.kt"); doTest(fileName); } @TestMetadata("inferenceTwoParams.kt") public void testInferenceTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/inferenceTwoParams.kt"); doTest(fileName); } @TestMetadata("kClassRuntime.kt") public void testKClassRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/kClassRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/kClassRuntime.kt"); doTest(fileName); } @TestMetadata("paramAsBound.kt") public void testParamAsBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/paramAsBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/paramAsBound.kt"); doTest(fileName); } @TestMetadata("withinDeclaration.kt") public void testWithinDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/withinDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addGenericUpperBound/withinDeclaration.kt"); doTest(fileName); } } @@ -238,42 +238,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixTest { public void testAllFilesPresentInAddStarProjections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("qualifiedArrayList.kt") public void testQualifiedArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedArrayList.kt"); doTest(fileName); } @TestMetadata("qualifiedList.kt") public void testQualifiedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedList.kt"); doTest(fileName); } @TestMetadata("qualifiedMap.kt") public void testQualifiedMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/qualifiedMap.kt"); doTest(fileName); } @TestMetadata("unqualifiedList.kt") public void testUnqualifiedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedList.kt"); doTest(fileName); } @TestMetadata("unqualifiedMap.kt") public void testUnqualifiedMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMap.kt"); doTest(fileName); } @TestMetadata("unqualifiedMapOneArg.kt") public void testUnqualifiedMapOneArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/unqualifiedMapOneArg.kt"); doTest(fileName); } @@ -282,18 +282,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Cast extends AbstractQuickFixTest { public void testAllFilesPresentInCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeToStarProjection.kt") public void testChangeToStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjection.kt"); doTest(fileName); } @TestMetadata("changeToStarProjectionNullable.kt") public void testChangeToStarProjectionNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt"); doTest(fileName); } } @@ -303,24 +303,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CheckType extends AbstractQuickFixTest { public void testAllFilesPresentInCheckType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeToStarProjectionMultipleParameters.kt") public void testChangeToStarProjectionMultipleParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionMultipleParameters.kt"); doTest(fileName); } @TestMetadata("changeToStarProjectionNullable.kt") public void testChangeToStarProjectionNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionNullable.kt"); doTest(fileName); } @TestMetadata("changeToStarProjectionSingleParameter.kt") public void testChangeToStarProjectionSingleParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/changeToStarProjectionSingleParameter.kt"); doTest(fileName); } } @@ -330,30 +330,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaClass extends AbstractQuickFixTest { public void testAllFilesPresentInJavaClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("fooOfC2.kt") public void testFooOfC2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt"); doTest(fileName); } @TestMetadata("javaClassOfC1Runtime.kt") public void testJavaClassOfC1Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC1Runtime.kt"); doTest(fileName); } @TestMetadata("javaClassOfC2Runtime.kt") public void testJavaClassOfC2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfC2Runtime.kt"); doTest(fileName); } @TestMetadata("javaClassOfCRuntime.kt") public void testJavaClassOfCRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/javaClassOfCRuntime.kt"); doTest(fileName); } } @@ -363,42 +363,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractQuickFixTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("qualifiedArrayList.kt") public void testQualifiedArrayList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedArrayList.kt"); doTest(fileName); } @TestMetadata("qualifiedList.kt") public void testQualifiedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedList.kt"); doTest(fileName); } @TestMetadata("qualifiedMap.kt") public void testQualifiedMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt"); doTest(fileName); } @TestMetadata("unqualifiedList.kt") public void testUnqualifiedList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedList.kt"); doTest(fileName); } @TestMetadata("unqualifiedMap.kt") public void testUnqualifiedMap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMap.kt"); doTest(fileName); } @TestMetadata("unqualifiedMapOneArg.kt") public void testUnqualifiedMapOneArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/unqualifiedMapOneArg.kt"); doTest(fileName); } } @@ -409,102 +409,102 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AutoImports extends AbstractQuickFixTest { public void testAllFilesPresentInAutoImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("checkNoStackOverflowInImportInnerClassInCurrentFile.kt") public void testCheckNoStackOverflowInImportInnerClassInCurrentFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/checkNoStackOverflowInImportInnerClassInCurrentFile.kt"); doTest(fileName); } @TestMetadata("infixCallAndObject.kt") public void testInfixCallAndObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCallAndObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCallAndObject.kt"); doTest(fileName); } @TestMetadata("libraryPropertyJsRuntime.kt") public void testLibraryPropertyJsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyJsRuntime.kt"); doTest(fileName); } @TestMetadata("libraryPropertyRuntime.kt") public void testLibraryPropertyRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryPropertyRuntime.kt"); doTest(fileName); } @TestMetadata("libraryTopLevelFunctionImportJsRuntime.kt") public void testLibraryTopLevelFunctionImportJsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportJsRuntime.kt"); doTest(fileName); } @TestMetadata("libraryTopLevelFunctionImportRuntime.kt") public void testLibraryTopLevelFunctionImportRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt"); doTest(fileName); } @TestMetadata("namelessClass.kt") public void testNamelessClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessClass.kt"); doTest(fileName); } @TestMetadata("namelessFunction.kt") public void testNamelessFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessFunction.kt"); doTest(fileName); } @TestMetadata("namelessObject.kt") public void testNamelessObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessObject.kt"); doTest(fileName); } @TestMetadata("namelessParameter.kt") public void testNamelessParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessParameter.kt"); doTest(fileName); } @TestMetadata("namelessProperty.kt") public void testNamelessProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/namelessProperty.kt"); doTest(fileName); } @TestMetadata("noImportForAlreadyImported.kt") public void testNoImportForAlreadyImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForAlreadyImported.kt"); doTest(fileName); } @TestMetadata("noImportForIndex.kt") public void testNoImportForIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForIndex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForIndex.kt"); doTest(fileName); } @TestMetadata("notForThisLabel.kt") public void testNotForThisLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/notForThisLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/notForThisLabel.kt"); doTest(fileName); } @TestMetadata("sAMConstructorFromLambda.kt") public void testSAMConstructorFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt"); doTest(fileName); } @TestMetadata("unresolvedReferenceInCall.kt") public void testUnresolvedReferenceInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt"); doTest(fileName); } } @@ -515,161 +515,161 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class ChangeSignature extends AbstractQuickFixTest { @TestMetadata("addConstructorParameter.kt") public void testAddConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addConstructorParameter.kt"); doTest(fileName); } @TestMetadata("addFunctionParameter.kt") public void testAddFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameter.kt"); doTest(fileName); } @TestMetadata("addFunctionParameterAndChangeTypes.kt") public void testAddFunctionParameterAndChangeTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterAndChangeTypes.kt"); doTest(fileName); } @TestMetadata("addFunctionParameterLongNameRuntime.kt") public void testAddFunctionParameterLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addFunctionParameterLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("addNothingReturnType.kt") public void testAddNothingReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addNothingReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addNothingReturnType.kt"); doTest(fileName); } @TestMetadata("addParameterNotAvailableForBuiltins.kt") public void testAddParameterNotAvailableForBuiltins() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForBuiltins.kt"); doTest(fileName); } @TestMetadata("addParameterNotAvailableForLibrary.kt") public void testAddParameterNotAvailableForLibrary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterNotAvailableForLibrary.kt"); doTest(fileName); } @TestMetadata("addParameterToFakeOverride.kt") public void testAddParameterToFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/addParameterToFakeOverride.kt"); doTest(fileName); } public void testAllFilesPresentInChangeSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/changeSignature"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeFunctionLiteralParameters1.kt") public void testChangeFunctionLiteralParameters1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt"); doTest(fileName); } @TestMetadata("changeFunctionLiteralParameters2.kt") public void testChangeFunctionLiteralParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt"); doTest(fileName); } @TestMetadata("complexHierarchy.kt") public void testComplexHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchy.kt"); doTest(fileName); } @TestMetadata("complexHierarchyHead.kt") public void testComplexHierarchyHead() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyHead.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyHead.kt"); doTest(fileName); } @TestMetadata("complexHierarchyTail.kt") public void testComplexHierarchyTail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyTail.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/complexHierarchyTail.kt"); doTest(fileName); } @TestMetadata("fixExtensionLambdaSignature.kt") public void testFixExtensionLambdaSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt"); doTest(fileName); } @TestMetadata("linearHierarchy.kt") public void testLinearHierarchy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/linearHierarchy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/linearHierarchy.kt"); doTest(fileName); } @TestMetadata("notAvailableForSynthesized.kt") public void testNotAvailableForSynthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notAvailableForSynthesized.kt"); doTest(fileName); } @TestMetadata("notEditable.kt") public void testNotEditable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notEditable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/notEditable.kt"); doTest(fileName); } @TestMetadata("removeConstructorParameter.kt") public void testRemoveConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeConstructorParameter.kt"); doTest(fileName); } @TestMetadata("removeFunctionFirstParameter.kt") public void testRemoveFunctionFirstParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionFirstParameter.kt"); doTest(fileName); } @TestMetadata("removeFunctionSecondParameter1.kt") public void testRemoveFunctionSecondParameter1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter1.kt"); doTest(fileName); } @TestMetadata("removeFunctionSecondParameter2.kt") public void testRemoveFunctionSecondParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeFunctionSecondParameter2.kt"); doTest(fileName); } @TestMetadata("removeNamedParameter.kt") public void testRemoveNamedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeNamedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeNamedParameter.kt"); doTest(fileName); } @TestMetadata("removeParameterFromFakeOverride.kt") public void testRemoveParameterFromFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterFromFakeOverride.kt"); doTest(fileName); } @TestMetadata("removeParameterNotAvailableForBuiltins.kt") public void testRemoveParameterNotAvailableForBuiltins() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeParameterNotAvailableForBuiltins.kt"); doTest(fileName); } @TestMetadata("removeUnusedExtensionParameter.kt") public void testRemoveUnusedExtensionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedExtensionParameter.kt"); doTest(fileName); } @TestMetadata("removeUnusedParameter.kt") public void testRemoveUnusedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameter.kt"); doTest(fileName); } } @@ -679,12 +679,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CheckArguments extends AbstractQuickFixTest { public void testAllFilesPresentInCheckArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("nonVarargSpread.kt") public void testNonVarargSpread() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/nonVarargSpread.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/nonVarargSpread.kt"); doTest(fileName); } @@ -693,48 +693,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddNameToArgument extends AbstractQuickFixTest { public void testAllFilesPresentInAddNameToArgument() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments/addNameToArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments/addNameToArgument"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("invokeOnString.kt") public void testInvokeOnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/invokeOnString.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArguments.kt") public void testMixedNamedAndPositionalArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArguments.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArgumentsConstructor.kt") public void testMixedNamedAndPositionalArgumentsConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsConstructor.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArgumentsMultiple.kt") public void testMixedNamedAndPositionalArgumentsMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsMultiple.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArgumentsSubtype.kt") public void testMixedNamedAndPositionalArgumentsSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsSubtype.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArgumentsUsedNamed.kt") public void testMixedNamedAndPositionalArgumentsUsedNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedNamed.kt"); doTest(fileName); } @TestMetadata("mixedNamedAndPositionalArgumentsUsedPositional.kt") public void testMixedNamedAndPositionalArgumentsUsedPositional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/addNameToArgument/mixedNamedAndPositionalArgumentsUsedPositional.kt"); doTest(fileName); } } @@ -745,24 +745,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConflictingImports extends AbstractQuickFixTest { public void testAllFilesPresentInConflictingImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/conflictingImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/conflictingImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("removeConflictingImport.kt") public void testRemoveConflictingImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeConflictingImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeConflictingImport.kt"); doTest(fileName); } @TestMetadata("removeDuplicateImport.kt") public void testRemoveDuplicateImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeDuplicateImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeDuplicateImport.kt"); doTest(fileName); } @TestMetadata("removeDuplicateImportWithAlias.kt") public void testRemoveDuplicateImportWithAlias() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeDuplicateImportWithAlias.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/conflictingImports/removeDuplicateImportWithAlias.kt"); doTest(fileName); } } @@ -772,7 +772,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createClass") @@ -780,7 +780,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CreateClass extends AbstractQuickFixTest { public void testAllFilesPresentInCreateClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry") @@ -788,54 +788,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationEntry extends AbstractQuickFixTest { public void testAllFilesPresentInAnnotationEntry() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/annotationEntry"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotationNoBrackets.kt") public void testAnnotationNoBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoBrackets.kt"); doTest(fileName); } @TestMetadata("annotationNoParamList.kt") public void testAnnotationNoParamList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParamList.kt"); doTest(fileName); } @TestMetadata("annotationNoParams.kt") public void testAnnotationNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationNoParams.kt"); doTest(fileName); } @TestMetadata("annotationWithParams.kt") public void testAnnotationWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithParams.kt"); doTest(fileName); } @TestMetadata("annotationWithTypeParams.kt") public void testAnnotationWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/annotationWithTypeParams.kt"); doTest(fileName); } @TestMetadata("notAnnotation.kt") public void testNotAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/notAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/notAnnotation.kt"); doTest(fileName); } @TestMetadata("singleArgAnnotation.kt") public void testSingleArgAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleArgAnnotation.kt"); doTest(fileName); } @TestMetadata("singleNamedArgAnnotation.kt") public void testSingleNamedArgAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/annotationEntry/singleNamedArgAnnotation.kt"); doTest(fileName); } } @@ -845,192 +845,192 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CallExpression extends AbstractQuickFixTest { public void testAllFilesPresentInCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callInAnnotationEntry.kt") public void testCallInAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInAnnotationEntry.kt"); doTest(fileName); } @TestMetadata("callInLambda.kt") public void testCallInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt"); doTest(fileName); } @TestMetadata("callInLocalFunNoReceiver.kt") public void testCallInLocalFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLocalFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("callInMemberFunNoReceiver.kt") public void testCallInMemberFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("callInMemberValDelegateRuntime.kt") public void testCallInMemberValDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberValDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("callInMemberVarDelegateRuntime.kt") public void testCallInMemberVarDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callInMemberVarDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("callNoReceiver.kt") public void testCallNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callNoReceiver.kt"); doTest(fileName); } @TestMetadata("callWithClassQualifier.kt") public void testCallWithClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithClassQualifier.kt"); doTest(fileName); } @TestMetadata("callWithExplicitParamNames.kt") public void testCallWithExplicitParamNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExplicitParamNames.kt"); doTest(fileName); } @TestMetadata("callWithExtraArgs.kt") public void testCallWithExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithExtraArgs.kt"); doTest(fileName); } @TestMetadata("callWithFinalSupertype.kt") public void testCallWithFinalSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithFinalSupertype.kt"); doTest(fileName); } @TestMetadata("callWithGenericReceiver.kt") public void testCallWithGenericReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt"); doTest(fileName); } @TestMetadata("callWithLambdaArg.kt") public void testCallWithLambdaArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArg.kt"); doTest(fileName); } @TestMetadata("callWithLambdaArgOnly.kt") public void testCallWithLambdaArgOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLambdaArgOnly.kt"); doTest(fileName); } @TestMetadata("callWithLibClassQualifier.kt") public void testCallWithLibClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithLibClassQualifier.kt"); doTest(fileName); } @TestMetadata("callWithMissingArgs.kt") public void testCallWithMissingArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithMissingArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithMissingArgs.kt"); doTest(fileName); } @TestMetadata("callWithObjectQualifier.kt") public void testCallWithObjectQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithObjectQualifier.kt"); doTest(fileName); } @TestMetadata("callWithPackageName.kt") public void testCallWithPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithPackageName.kt"); doTest(fileName); } @TestMetadata("callWithReceiver.kt") public void testCallWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithReceiver.kt"); doTest(fileName); } @TestMetadata("callWithSuperclassNoConstructorParams.kt") public void testCallWithSuperclassNoConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassNoConstructorParams.kt"); doTest(fileName); } @TestMetadata("callWithSuperclassWithConstructorParams.kt") public void testCallWithSuperclassWithConstructorParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSuperclassWithConstructorParams.kt"); doTest(fileName); } @TestMetadata("callWithSupertrait.kt") public void testCallWithSupertrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithSupertrait.kt"); doTest(fileName); } @TestMetadata("callWithThisReceiverInClass.kt") public void testCallWithThisReceiverInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInClass.kt"); doTest(fileName); } @TestMetadata("callWithThisReceiverInExtension.kt") public void testCallWithThisReceiverInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInExtension.kt"); doTest(fileName); } @TestMetadata("callWithThisReceiverInNestedClass1.kt") public void testCallWithThisReceiverInNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass1.kt"); doTest(fileName); } @TestMetadata("callWithThisReceiverInNestedClass2.kt") public void testCallWithThisReceiverInNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithThisReceiverInNestedClass2.kt"); doTest(fileName); } @TestMetadata("callWithTypeArgsInAnnotationEntry.kt") public void testCallWithTypeArgsInAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithTypeArgsInAnnotationEntry.kt"); doTest(fileName); } @TestMetadata("quotedName.kt") public void testQuotedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/quotedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/quotedName.kt"); doTest(fileName); } @TestMetadata("singleArgCallInAnnotationEntry.kt") public void testSingleArgCallInAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleArgCallInAnnotationEntry.kt"); doTest(fileName); } @TestMetadata("singleNamedArgCallInAnnotationEntry.kt") public void testSingleNamedArgCallInAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/singleNamedArgCallInAnnotationEntry.kt"); doTest(fileName); } @TestMetadata("unusedCallResult.kt") public void testUnusedCallResult() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/unusedCallResult.kt"); doTest(fileName); } @@ -1039,78 +1039,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callWithStarProjection.kt") public void testCallWithStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/callWithStarProjection.kt"); doTest(fileName); } @TestMetadata("classMember.kt") public void testClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMember.kt"); doTest(fileName); } @TestMetadata("classMemberInner.kt") public void testClassMemberInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInner.kt"); doTest(fileName); } @TestMetadata("classMemberInnerPartialSubstitution.kt") public void testClassMemberInnerPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerPartialSubstitution.kt"); doTest(fileName); } @TestMetadata("classMemberInnerWithReceiverArg.kt") public void testClassMemberInnerWithReceiverArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberInnerWithReceiverArg.kt"); doTest(fileName); } @TestMetadata("classMemberPartialSubstitution.kt") public void testClassMemberPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/classMemberPartialSubstitution.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/extension.kt"); doTest(fileName); } @TestMetadata("noReceiver.kt") public void testNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiver.kt"); doTest(fileName); } @TestMetadata("noReceiverExtraArgs.kt") public void testNoReceiverExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverExtraArgs.kt"); doTest(fileName); } @TestMetadata("noReceiverLongName.kt") public void testNoReceiverLongName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverLongName.kt"); doTest(fileName); } @TestMetadata("noReceiverPartialSubstitution.kt") public void testNoReceiverPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/noReceiverPartialSubstitution.kt"); doTest(fileName); } @TestMetadata("withExpectedTypeNoReceiver.kt") public void testWithExpectedTypeNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/withExpectedTypeNoReceiver.kt"); doTest(fileName); } } @@ -1121,48 +1121,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class DelegationSpecifier extends AbstractQuickFixTest { public void testAllFilesPresentInDelegationSpecifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("classDelegatorToSuperclass.kt") public void testClassDelegatorToSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/classDelegatorToSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/classDelegatorToSuperclass.kt"); doTest(fileName); } @TestMetadata("delegatorToSupercallNoReceiver.kt") public void testDelegatorToSupercallNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallNoReceiver.kt"); doTest(fileName); } @TestMetadata("delegatorToSupercallWithClassQualifier.kt") public void testDelegatorToSupercallWithClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithClassQualifier.kt"); doTest(fileName); } @TestMetadata("delegatorToSupercallWithPackageQualifier.kt") public void testDelegatorToSupercallWithPackageQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithPackageQualifier.kt"); doTest(fileName); } @TestMetadata("delegatorToSupercallWithParamNames.kt") public void testDelegatorToSupercallWithParamNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithParamNames.kt"); doTest(fileName); } @TestMetadata("delegatorToSupercallWithTypeParams.kt") public void testDelegatorToSupercallWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/delegatorToSupercallWithTypeParams.kt"); doTest(fileName); } @TestMetadata("traitDelegatorToSuperclass.kt") public void testTraitDelegatorToSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/delegationSpecifier/traitDelegatorToSuperclass.kt"); doTest(fileName); } } @@ -1172,84 +1172,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ImportDirective extends AbstractQuickFixTest { public void testAllFilesPresentInImportDirective() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/importDirective"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotationInPackage.kt") public void testAnnotationInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationInPackage.kt"); doTest(fileName); } @TestMetadata("annotationWithQualifier.kt") public void testAnnotationWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/annotationWithQualifier.kt"); doTest(fileName); } @TestMetadata("classInPackage.kt") public void testClassInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classInPackage.kt"); doTest(fileName); } @TestMetadata("classWithQualifier.kt") public void testClassWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/classWithQualifier.kt"); doTest(fileName); } @TestMetadata("enumEntryInEnum.kt") public void testEnumEntryInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInEnum.kt"); doTest(fileName); } @TestMetadata("enumEntryInPackage.kt") public void testEnumEntryInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryInPackage.kt"); doTest(fileName); } @TestMetadata("enumEntryWithQualifier.kt") public void testEnumEntryWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumEntryWithQualifier.kt"); doTest(fileName); } @TestMetadata("enumInPackage.kt") public void testEnumInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumInPackage.kt"); doTest(fileName); } @TestMetadata("enumWithQualifier.kt") public void testEnumWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/enumWithQualifier.kt"); doTest(fileName); } @TestMetadata("objectInPackage.kt") public void testObjectInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectInPackage.kt"); doTest(fileName); } @TestMetadata("objectWithQualifier.kt") public void testObjectWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/objectWithQualifier.kt"); doTest(fileName); } @TestMetadata("traitInPackage.kt") public void testTraitInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitInPackage.kt"); doTest(fileName); } @TestMetadata("traitWithQualifier.kt") public void testTraitWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/importDirective/traitWithQualifier.kt"); doTest(fileName); } } @@ -1259,180 +1259,180 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ReferenceExpression extends AbstractQuickFixTest { public void testAllFilesPresentInReferenceExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/referenceExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotationNoReceiver.kt") public void testAnnotationNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/annotationNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/annotationNoReceiver.kt"); doTest(fileName); } @TestMetadata("classByNestedQualifier.kt") public void testClassByNestedQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByNestedQualifier.kt"); doTest(fileName); } @TestMetadata("classByQualifier.kt") public void testClassByQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classByQualifier.kt"); doTest(fileName); } @TestMetadata("classInPackage.kt") public void testClassInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classInPackage.kt"); doTest(fileName); } @TestMetadata("classNoReceiver.kt") public void testClassNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classNoReceiver.kt"); doTest(fileName); } @TestMetadata("classWithQualifier.kt") public void testClassWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithQualifier.kt"); doTest(fileName); } @TestMetadata("classWithReceiver.kt") public void testClassWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt"); doTest(fileName); } @TestMetadata("enumByQualifier.kt") public void testEnumByQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumByQualifier.kt"); doTest(fileName); } @TestMetadata("enumEntryNoReceiver.kt") public void testEnumEntryNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryNoReceiver.kt"); doTest(fileName); } @TestMetadata("enumEntryWithEnumQualifier.kt") public void testEnumEntryWithEnumQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifier.kt"); doTest(fileName); } @TestMetadata("enumEntryWithEnumQualifierAndParams.kt") public void testEnumEntryWithEnumQualifierAndParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumQualifierAndParams.kt"); doTest(fileName); } @TestMetadata("enumEntryWithEnumSuperclass.kt") public void testEnumEntryWithEnumSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithEnumSuperclass.kt"); doTest(fileName); } @TestMetadata("enumEntryWithQualifier.kt") public void testEnumEntryWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithQualifier.kt"); doTest(fileName); } @TestMetadata("enumEntryWithReceiver.kt") public void testEnumEntryWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt"); doTest(fileName); } @TestMetadata("enumEntryWithSuperclass.kt") public void testEnumEntryWithSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithSuperclass.kt"); doTest(fileName); } @TestMetadata("enumNoReceiver.kt") public void testEnumNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumNoReceiver.kt"); doTest(fileName); } @TestMetadata("objectByQualifier.kt") public void testObjectByQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectByQualifier.kt"); doTest(fileName); } @TestMetadata("objectInPackage.kt") public void testObjectInPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectInPackage.kt"); doTest(fileName); } @TestMetadata("objectNoReceiver.kt") public void testObjectNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectNoReceiver.kt"); doTest(fileName); } @TestMetadata("objectWithQualifier.kt") public void testObjectWithQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithQualifier.kt"); doTest(fileName); } @TestMetadata("objectWithReceiver.kt") public void testObjectWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt"); doTest(fileName); } @TestMetadata("objectWithSuperclass.kt") public void testObjectWithSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSuperclass.kt"); doTest(fileName); } @TestMetadata("objectWithSupertrait.kt") public void testObjectWithSupertrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithSupertrait.kt"); doTest(fileName); } @TestMetadata("recursiveBound.kt") public void testRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/recursiveBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/recursiveBound.kt"); doTest(fileName); } @TestMetadata("traitByQualifier.kt") public void testTraitByQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitByQualifier.kt"); doTest(fileName); } @TestMetadata("traitNoReceiver.kt") public void testTraitNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/traitNoReceiver.kt"); doTest(fileName); } @TestMetadata("unusedReference.kt") public void testUnusedReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/unusedReference.kt"); doTest(fileName); } @TestMetadata("valDelegateExpressionRuntime.kt") public void testValDelegateExpressionRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/valDelegateExpressionRuntime.kt"); doTest(fileName); } @TestMetadata("varDelegateExpressionRuntime.kt") public void testVarDelegateExpressionRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/referenceExpression/varDelegateExpressionRuntime.kt"); doTest(fileName); } } @@ -1442,114 +1442,114 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeReference extends AbstractQuickFixTest { public void testAllFilesPresentInTypeReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createClass/typeReference"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotationNotQualifierNoTypeArgs.kt") public void testAnnotationNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("annotationNotQualifierWithTypeArgs.kt") public void testAnnotationNotQualifierWithTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationNotQualifierWithTypeArgs.kt"); doTest(fileName); } @TestMetadata("annotationQualifierNoTypeArgs.kt") public void testAnnotationQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/annotationQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("classCurrentPackageReceiver.kt") public void testClassCurrentPackageReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classCurrentPackageReceiver.kt"); doTest(fileName); } @TestMetadata("classLibTypeReceiver.kt") public void testClassLibTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classLibTypeReceiver.kt"); doTest(fileName); } @TestMetadata("classNotQualifierNoTypeArgs.kt") public void testClassNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("classNotQualifierWithStarProjection.kt") public void testClassNotQualifierWithStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithStarProjection.kt"); doTest(fileName); } @TestMetadata("classNotQualifierWithTypeArgs.kt") public void testClassNotQualifierWithTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classNotQualifierWithTypeArgs.kt"); doTest(fileName); } @TestMetadata("classQualifierNoTypeArgs.kt") public void testClassQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("classUserTypeReceiver.kt") public void testClassUserTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiver.kt"); doTest(fileName); } @TestMetadata("classUserTypeReceiverNoBody.kt") public void testClassUserTypeReceiverNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/classUserTypeReceiverNoBody.kt"); doTest(fileName); } @TestMetadata("enumEntryNotQualifierNoTypeArgs.kt") public void testEnumEntryNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumEntryNotQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("enumNotQualifierNoTypeArgs.kt") public void testEnumNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("enumNotQualifierWithTypeArgs.kt") public void testEnumNotQualifierWithTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/enumNotQualifierWithTypeArgs.kt"); doTest(fileName); } @TestMetadata("objectNotQualifierNoTypeArgs.kt") public void testObjectNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("objectNotQualifierWithTypeArgs.kt") public void testObjectNotQualifierWithTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectNotQualifierWithTypeArgs.kt"); doTest(fileName); } @TestMetadata("objectQualifierNoTypeArgs.kt") public void testObjectQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/objectQualifierNoTypeArgs.kt"); doTest(fileName); } @TestMetadata("traitNotQualifierNoTypeArgs.kt") public void testTraitNotQualifierNoTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createClass/typeReference/traitNotQualifierNoTypeArgs.kt"); doTest(fileName); } } @@ -1560,7 +1560,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CreateFunction extends AbstractQuickFixTest { public void testAllFilesPresentInCreateFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations") @@ -1568,96 +1568,96 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class BinaryOperations extends AbstractQuickFixTest { public void testAllFilesPresentInBinaryOperations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("customOperationOnUserType.kt") public void testCustomOperationOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt"); doTest(fileName); } @TestMetadata("greaterOrEqualOnUserType.kt") public void testGreaterOrEqualOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt"); doTest(fileName); } @TestMetadata("inOnUserType.kt") public void testInOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt"); doTest(fileName); } @TestMetadata("lessOnUserType.kt") public void testLessOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt"); doTest(fileName); } @TestMetadata("notInOnUserType.kt") public void testNotInOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt"); doTest(fileName); } @TestMetadata("plusAssignOnUserType.kt") public void testPlusAssignOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt"); doTest(fileName); } @TestMetadata("plusExtraArgs.kt") public void testPlusExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt"); doTest(fileName); } @TestMetadata("plusForAssignmentOnUserType.kt") public void testPlusForAssignmentOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt"); doTest(fileName); } @TestMetadata("plusMissingArgs.kt") public void testPlusMissingArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt"); doTest(fileName); } @TestMetadata("plusOnLibType.kt") public void testPlusOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt"); doTest(fileName); } @TestMetadata("plusOnUserType.kt") public void testPlusOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt"); doTest(fileName); } @TestMetadata("plusOnUserTypeWithTypeParams.kt") public void testPlusOnUserTypeWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt"); doTest(fileName); } @TestMetadata("quotedName.kt") public void testQuotedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt"); doTest(fileName); } @TestMetadata("whenInOnUserType.kt") public void testWhenInOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt"); doTest(fileName); } @TestMetadata("whenNotInOnUserType.kt") public void testWhenNotInOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt"); doTest(fileName); } } @@ -1667,300 +1667,300 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Call extends AbstractQuickFixTest { public void testAllFilesPresentInCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callInAnnotationEntry.kt") public void testCallInAnnotationEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInAnnotationEntry.kt"); doTest(fileName); } @TestMetadata("callInStringTemplateRuntime.kt") public void testCallInStringTemplateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt"); doTest(fileName); } @TestMetadata("callWithLambdaArg.kt") public void testCallWithLambdaArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt"); doTest(fileName); } @TestMetadata("callWithLambdaArgOnly.kt") public void testCallWithLambdaArgOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt"); doTest(fileName); } @TestMetadata("doNotStripPrefix.kt") public void testDoNotStripPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt"); doTest(fileName); } @TestMetadata("extensionFunOnTrait.kt") public void testExtensionFunOnTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt"); doTest(fileName); } @TestMetadata("extensionRefInImport.kt") public void testExtensionRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionRefInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/extensionRefInImport.kt"); doTest(fileName); } @TestMetadata("funExtraArgs.kt") public void testFunExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt"); doTest(fileName); } @TestMetadata("funMissingArgs.kt") public void testFunMissingArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt"); doTest(fileName); } @TestMetadata("funOnClassNoClassObject.kt") public void testFunOnClassNoClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt"); doTest(fileName); } @TestMetadata("funOnClassObject.kt") public void testFunOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt"); doTest(fileName); } @TestMetadata("funOnLibObject.kt") public void testFunOnLibObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt"); doTest(fileName); } @TestMetadata("funOnLibType.kt") public void testFunOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt"); doTest(fileName); } @TestMetadata("funOnTrait.kt") public void testFunOnTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt"); doTest(fileName); } @TestMetadata("funOnUserObject.kt") public void testFunOnUserObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt"); doTest(fileName); } @TestMetadata("funOnUserType.kt") public void testFunOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt"); doTest(fileName); } @TestMetadata("funOnUserTypeWithDeclarations.kt") public void testFunOnUserTypeWithDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt"); doTest(fileName); } @TestMetadata("funOnUserTypeWithTypeParams.kt") public void testFunOnUserTypeWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt"); doTest(fileName); } @TestMetadata("funPlacement.kt") public void testFunPlacement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt"); doTest(fileName); } @TestMetadata("funWithExplicitParamNamesOnUserType.kt") public void testFunWithExplicitParamNamesOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt"); doTest(fileName); } @TestMetadata("funWithNullableParamType.kt") public void testFunWithNullableParamType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt"); doTest(fileName); } @TestMetadata("funWithNullableType.kt") public void testFunWithNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt"); doTest(fileName); } @TestMetadata("funWithNullableTypeParameter.kt") public void testFunWithNullableTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt"); doTest(fileName); } @TestMetadata("funWithPackageName.kt") public void testFunWithPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt"); doTest(fileName); } @TestMetadata("functionalType.kt") public void testFunctionalType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt"); doTest(fileName); } @TestMetadata("functionalTypeInReceiver.kt") public void testFunctionalTypeInReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt"); doTest(fileName); } @TestMetadata("inLambda.kt") public void testInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt"); doTest(fileName); } @TestMetadata("inconsistentTypes.kt") public void testInconsistentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt"); doTest(fileName); } @TestMetadata("localFunNoReceiver.kt") public void testLocalFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberFunNoReceiver.kt") public void testMemberFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberValDelegateRuntime.kt") public void testMemberValDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("memberVarDelegateRuntime.kt") public void testMemberVarDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("objectMemberFunNoReceiver.kt") public void testObjectMemberFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("privateForMembers.kt") public void testPrivateForMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt"); doTest(fileName); } @TestMetadata("propertyOnUserType.kt") public void testPropertyOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt"); doTest(fileName); } @TestMetadata("qualifiedCallInStringTemplateRuntime.kt") public void testQualifiedCallInStringTemplateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt"); doTest(fileName); } @TestMetadata("refInImport.kt") public void testRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/refInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/refInImport.kt"); doTest(fileName); } @TestMetadata("smartCastWithIs.kt") public void testSmartCastWithIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt"); doTest(fileName); } @TestMetadata("smartCastWithNullCheck.kt") public void testSmartCastWithNullCheck() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt"); doTest(fileName); } @TestMetadata("stripPrefix.kt") public void testStripPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt"); doTest(fileName); } @TestMetadata("thisInClass.kt") public void testThisInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt"); doTest(fileName); } @TestMetadata("thisInExtension.kt") public void testThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass1.kt") public void testThisInNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass2.kt") public void testThisInNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt"); doTest(fileName); } @TestMetadata("topLevelFunNoReceiver.kt") public void testTopLevelFunNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt"); doTest(fileName); } @TestMetadata("topLevelFunPlacement.kt") public void testTopLevelFunPlacement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt"); doTest(fileName); } @TestMetadata("unitFun.kt") public void testUnitFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt"); doTest(fileName); } @TestMetadata("unknownType.kt") public void testUnknownType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt"); doTest(fileName); } @TestMetadata("unresolvedSupertype.kt") public void testUnresolvedSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt"); doTest(fileName); } @@ -1969,72 +1969,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callWithStarProjection.kt") public void testCallWithStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt"); doTest(fileName); } @TestMetadata("classMember.kt") public void testClassMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt"); doTest(fileName); } @TestMetadata("classMemberPartialSubstitution.kt") public void testClassMemberPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt"); doTest(fileName); } @TestMetadata("classMemberWithReceiverArg.kt") public void testClassMemberWithReceiverArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt"); doTest(fileName); } @TestMetadata("extensionPartialSubstitution.kt") public void testExtensionPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt"); doTest(fileName); } @TestMetadata("extensionWithReceiverArg.kt") public void testExtensionWithReceiverArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt"); doTest(fileName); } @TestMetadata("noReceiver.kt") public void testNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt"); doTest(fileName); } @TestMetadata("noReceiverExtraArgs.kt") public void testNoReceiverExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt"); doTest(fileName); } @TestMetadata("noReceiverLongName.kt") public void testNoReceiverLongName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt"); doTest(fileName); } @TestMetadata("noReceiverPartialSubstitution.kt") public void testNoReceiverPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt"); doTest(fileName); } } @@ -2045,24 +2045,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Component extends AbstractQuickFixTest { public void testAllFilesPresentInComponent() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/component"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/component"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createComponentFromUsage1.kt") public void testCreateComponentFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt"); doTest(fileName); } @TestMetadata("createComponentFromUsage2.kt") public void testCreateComponentFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt"); doTest(fileName); } @TestMetadata("createComponentFromUsage3.kt") public void testCreateComponentFromUsage3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt"); doTest(fileName); } } @@ -2072,30 +2072,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class DelegateAccessors extends AbstractQuickFixTest { public void testAllFilesPresentInDelegateAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("val.kt") public void testVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt"); doTest(fileName); } @TestMetadata("var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt"); doTest(fileName); } @TestMetadata("varMissingGet.kt") public void testVarMissingGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt"); doTest(fileName); } @TestMetadata("varMissingSet.kt") public void testVarMissingSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt"); doTest(fileName); } } @@ -2105,78 +2105,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Get extends AbstractQuickFixTest { public void testAllFilesPresentInGet() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/get"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/get"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createGetFromUsage1.kt") public void testCreateGetFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage10.kt") public void testCreateGetFromUsage10() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage11.kt") public void testCreateGetFromUsage11() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage12.kt") public void testCreateGetFromUsage12() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage13.kt") public void testCreateGetFromUsage13() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage2.kt") public void testCreateGetFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage3.kt") public void testCreateGetFromUsage3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage4.kt") public void testCreateGetFromUsage4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage5.kt") public void testCreateGetFromUsage5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage7.kt") public void testCreateGetFromUsage7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage8.kt") public void testCreateGetFromUsage8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt"); doTest(fileName); } @TestMetadata("createGetFromUsage9.kt") public void testCreateGetFromUsage9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt"); doTest(fileName); } } @@ -2186,18 +2186,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class HasNext extends AbstractQuickFixTest { public void testAllFilesPresentInHasNext() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/hasNext"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/hasNext"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createHasNextFromUsage1.kt") public void testCreateHasNextFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt"); doTest(fileName); } @TestMetadata("createHasNextFromUsage2.kt") public void testCreateHasNextFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt"); doTest(fileName); } } @@ -2207,30 +2207,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractQuickFixTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/invoke"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/invoke"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("invokeOnLibType.kt") public void testInvokeOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt"); doTest(fileName); } @TestMetadata("invokeOnUserType.kt") public void testInvokeOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt"); doTest(fileName); } @TestMetadata("invokeOnUserTypeWithTypeParams.kt") public void testInvokeOnUserTypeWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt"); doTest(fileName); } @TestMetadata("invokeWithExplicitParamNamesOnUserType.kt") public void testInvokeWithExplicitParamNamesOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt"); doTest(fileName); } } @@ -2240,24 +2240,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Iterator extends AbstractQuickFixTest { public void testAllFilesPresentInIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/iterator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/iterator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createIteratorFromUsage1.kt") public void testCreateIteratorFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt"); doTest(fileName); } @TestMetadata("createIteratorFromUsage2.kt") public void testCreateIteratorFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt"); doTest(fileName); } @TestMetadata("createIteratorFromUsage3.kt") public void testCreateIteratorFromUsage3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt"); doTest(fileName); } } @@ -2267,18 +2267,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Next extends AbstractQuickFixTest { public void testAllFilesPresentInNext() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/next"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/next"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createNextFromUsage1.kt") public void testCreateNextFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt"); doTest(fileName); } @TestMetadata("createNextFromUsage2.kt") public void testCreateNextFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt"); doTest(fileName); } } @@ -2288,24 +2288,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Set extends AbstractQuickFixTest { public void testAllFilesPresentInSet() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/set"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/set"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("createSetFromUsage1.kt") public void testCreateSetFromUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt"); doTest(fileName); } @TestMetadata("createSetFromUsage2.kt") public void testCreateSetFromUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt"); doTest(fileName); } @TestMetadata("setterForIncrement.kt") public void testSetterForIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt"); doTest(fileName); } } @@ -2315,36 +2315,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnaryOperations extends AbstractQuickFixTest { public void testAllFilesPresentInUnaryOperations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("incOnUserType.kt") public void testIncOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt"); doTest(fileName); } @TestMetadata("minusMissingArgs.kt") public void testMinusMissingArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt"); doTest(fileName); } @TestMetadata("minusOnLibType.kt") public void testMinusOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt"); doTest(fileName); } @TestMetadata("minusOnUserType.kt") public void testMinusOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt"); doTest(fileName); } @TestMetadata("minusOnUserTypeWithTypeParams.kt") public void testMinusOnUserTypeWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt"); doTest(fileName); } } @@ -2355,66 +2355,66 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CreateSecondaryConstructor extends AbstractQuickFixTest { public void testAllFilesPresentInCreateSecondaryConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createSecondaryConstructor"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callWithExpectedType.kt") public void testCallWithExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithExpectedType.kt"); doTest(fileName); } @TestMetadata("callWithTypeArguments.kt") public void testCallWithTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/callWithTypeArguments.kt"); doTest(fileName); } @TestMetadata("classWithBody.kt") public void testClassWithBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithBody.kt"); doTest(fileName); } @TestMetadata("classWithoutBody.kt") public void testClassWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/classWithoutBody.kt"); doTest(fileName); } @TestMetadata("delegatorToSuperCall.kt") public void testDelegatorToSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCall.kt"); doTest(fileName); } @TestMetadata("delegatorToSuperCallNoClass.kt") public void testDelegatorToSuperCallNoClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallNoClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/delegatorToSuperCallNoClass.kt"); doTest(fileName); } @TestMetadata("superCall.kt") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCall.kt"); doTest(fileName); } @TestMetadata("superCallNoClass.kt") public void testSuperCallNoClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallNoClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/superCallNoClass.kt"); doTest(fileName); } @TestMetadata("thisCall.kt") public void testThisCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/thisCall.kt"); doTest(fileName); } @TestMetadata("wrongExpectedType.kt") public void testWrongExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/wrongExpectedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor/wrongExpectedType.kt"); doTest(fileName); } } @@ -2424,7 +2424,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class CreateVariable extends AbstractQuickFixTest { public void testAllFilesPresentInCreateVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable") @@ -2432,114 +2432,114 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class LocalVariable extends AbstractQuickFixTest { public void testAllFilesPresentInLocalVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/localVariable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/localVariable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assignedInFun.kt") public void testAssignedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/assignedInFun.kt"); doTest(fileName); } @TestMetadata("inAccessor.kt") public void testInAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessor.kt"); doTest(fileName); } @TestMetadata("inAccessorWithExpressionBody.kt") public void testInAccessorWithExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAccessorWithExpressionBody.kt"); doTest(fileName); } @TestMetadata("inClass.kt") public void testInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inClass.kt"); doTest(fileName); } @TestMetadata("inFun.kt") public void testInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFun.kt"); doTest(fileName); } @TestMetadata("inFunWithExpressionBody.kt") public void testInFunWithExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inFunWithExpressionBody.kt"); doTest(fileName); } @TestMetadata("inLambdaNoParams.kt") public void testInLambdaNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaNoParams.kt"); doTest(fileName); } @TestMetadata("inLambdaWithParams.kt") public void testInLambdaWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inLambdaWithParams.kt"); doTest(fileName); } @TestMetadata("inMultiLineLambdaNoParams.kt") public void testInMultiLineLambdaNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaNoParams.kt"); doTest(fileName); } @TestMetadata("inMultiLineLambdaWithParams.kt") public void testInMultiLineLambdaWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inMultiLineLambdaWithParams.kt"); doTest(fileName); } @TestMetadata("inWhen.kt") public void testInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/inWhen.kt"); doTest(fileName); } @TestMetadata("localWithPackageName.kt") public void testLocalWithPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/localWithPackageName.kt"); doTest(fileName); } @TestMetadata("nonIdentifier.kt") public void testNonIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt"); doTest(fileName); } @TestMetadata("nullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/nullableType.kt"); doTest(fileName); } @TestMetadata("onTopLevel.kt") public void testOnTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/onTopLevel.kt"); doTest(fileName); } @TestMetadata("positionNextToUsage.kt") public void testPositionNextToUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/positionNextToUsage.kt"); doTest(fileName); } @TestMetadata("qualifiedInFun.kt") public void testQualifiedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt"); doTest(fileName); } @TestMetadata("unitTypedInFun.kt") public void testUnitTypedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/localVariable/unitTypedInFun.kt"); doTest(fileName); } } @@ -2549,282 +2549,282 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractQuickFixTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/parameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assignedInFun.kt") public void testAssignedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFun.kt"); doTest(fileName); } @TestMetadata("assignedInFunInClass.kt") public void testAssignedInFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/assignedInFunInClass.kt"); doTest(fileName); } @TestMetadata("inAccessorInClass.kt") public void testInAccessorInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClass.kt"); doTest(fileName); } @TestMetadata("inAccessorInClassObject.kt") public void testInAccessorInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInClassObject.kt"); doTest(fileName); } @TestMetadata("inAccessorInGenClass.kt") public void testInAccessorInGenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInGenClass.kt"); doTest(fileName); } @TestMetadata("inAccessorInObject.kt") public void testInAccessorInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInObject.kt"); doTest(fileName); } @TestMetadata("inAccessorInTrait.kt") public void testInAccessorInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorInTrait.kt"); doTest(fileName); } @TestMetadata("inAccessorNoClass.kt") public void testInAccessorNoClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorNoClass.kt"); doTest(fileName); } @TestMetadata("inAccessorWithExpressionBodyInClass.kt") public void testInAccessorWithExpressionBodyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAccessorWithExpressionBodyInClass.kt"); doTest(fileName); } @TestMetadata("inAnonymousObject.kt") public void testInAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAnonymousObject.kt"); doTest(fileName); } @TestMetadata("inAnonymousObjectInSecondaryConstructor.kt") public void testInAnonymousObjectInSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAnonymousObjectInSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inAnonymousObjectInSecondaryConstructor.kt"); doTest(fileName); } @TestMetadata("inClassInitializer.kt") public void testInClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassInitializer.kt"); doTest(fileName); } @TestMetadata("inClassObjectInitializer.kt") public void testInClassObjectInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassObjectInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inClassObjectInitializer.kt"); doTest(fileName); } @TestMetadata("inFun.kt") public void testInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFun.kt"); doTest(fileName); } @TestMetadata("inFunInClass.kt") public void testInFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInClass.kt"); doTest(fileName); } @TestMetadata("inFunInGenClass.kt") public void testInFunInGenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inFunInGenClass.kt"); doTest(fileName); } @TestMetadata("inGenAccessorInClass.kt") public void testInGenAccessorInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInClass.kt"); doTest(fileName); } @TestMetadata("inGenAccessorInGenClass.kt") public void testInGenAccessorInGenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenAccessorInGenClass.kt"); doTest(fileName); } @TestMetadata("inGenFunInClass.kt") public void testInGenFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt"); doTest(fileName); } @TestMetadata("inGenFunInGenClass.kt") public void testInGenFunInGenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt"); doTest(fileName); } @TestMetadata("inLambdaNoParams.kt") public void testInLambdaNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaNoParams.kt"); doTest(fileName); } @TestMetadata("inLambdaWithIt.kt") public void testInLambdaWithIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithIt.kt"); doTest(fileName); } @TestMetadata("inLambdaWithParams.kt") public void testInLambdaWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithParams.kt"); doTest(fileName); } @TestMetadata("inLambdaWithTypedParams.kt") public void testInLambdaWithTypedParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inLambdaWithTypedParams.kt"); doTest(fileName); } @TestMetadata("inMultiLineLambdaNoParams.kt") public void testInMultiLineLambdaNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inMultiLineLambdaNoParams.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInClass.kt") public void testInPropertyInitializerInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClass.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInClassObject.kt") public void testInPropertyInitializerInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInClassObject.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInEnumClass.kt") public void testInPropertyInitializerInEnumClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumClass.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInEnumEntry.kt") public void testInPropertyInitializerInEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInEnumEntry.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInGenClass.kt") public void testInPropertyInitializerInGenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInGenClass.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInNestedClass.kt") public void testInPropertyInitializerInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInNestedClass.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerInObject.kt") public void testInPropertyInitializerInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerInObject.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializerNoClass.kt") public void testInPropertyInitializerNoClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inPropertyInitializerNoClass.kt"); doTest(fileName); } @TestMetadata("inSecondaryConstructor.kt") public void testInSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inSecondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/inSecondaryConstructor.kt"); doTest(fileName); } @TestMetadata("namedArgInConstructorCall.kt") public void testNamedArgInConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInConstructorCall.kt"); doTest(fileName); } @TestMetadata("namedArgInFunctionCall.kt") public void testNamedArgInFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/namedArgInFunctionCall.kt"); doTest(fileName); } @TestMetadata("nonIdentifier.kt") public void testNonIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt"); doTest(fileName); } @TestMetadata("nullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/nullableType.kt"); doTest(fileName); } @TestMetadata("parameterFromClassDelegationSpecifier.kt") public void testParameterFromClassDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromClassDelegationSpecifier.kt"); doTest(fileName); } @TestMetadata("parameterFromEnumEntryDelegationSpecifier.kt") public void testParameterFromEnumEntryDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromEnumEntryDelegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromEnumEntryDelegationSpecifier.kt"); doTest(fileName); } @TestMetadata("parameterFromObjectDelegationSpecifier.kt") public void testParameterFromObjectDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromObjectDelegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/parameterFromObjectDelegationSpecifier.kt"); doTest(fileName); } @TestMetadata("qualifiedInFun.kt") public void testQualifiedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt"); doTest(fileName); } @TestMetadata("quotedName.kt") public void testQuotedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/quotedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/quotedName.kt"); doTest(fileName); } @TestMetadata("recursiveBound.kt") public void testRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/recursiveBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/recursiveBound.kt"); doTest(fileName); } @TestMetadata("withPackageName.kt") public void testWithPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/withPackageName.kt"); doTest(fileName); } @TestMetadata("wrongReceiver.kt") public void testWrongReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/parameter/wrongReceiver.kt"); doTest(fileName); } } @@ -2834,84 +2834,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class PrimaryParameter extends AbstractQuickFixTest { public void testAllFilesPresentInPrimaryParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("localValNoReceiver.kt") public void testLocalValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/localValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/localValNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberValNoReceiver.kt") public void testMemberValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/memberValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/memberValNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberVarNoReceiver.kt") public void testMemberVarNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/memberVarNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/memberVarNoReceiver.kt"); doTest(fileName); } @TestMetadata("objectMemberValNoReceiver.kt") public void testObjectMemberValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/objectMemberValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/objectMemberValNoReceiver.kt"); doTest(fileName); } @TestMetadata("thisInClass.kt") public void testThisInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInClass.kt"); doTest(fileName); } @TestMetadata("thisInExtension.kt") public void testThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInExtension.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass1.kt") public void testThisInNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInNestedClass1.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass2.kt") public void testThisInNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/thisInNestedClass2.kt"); doTest(fileName); } @TestMetadata("topLevelValNoReceiver.kt") public void testTopLevelValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/topLevelValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/topLevelValNoReceiver.kt"); doTest(fileName); } @TestMetadata("valOnCompanionObject.kt") public void testValOnCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt"); doTest(fileName); } @TestMetadata("valOnLibType.kt") public void testValOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnLibType.kt"); doTest(fileName); } @TestMetadata("valOnUserType.kt") public void testValOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnUserType.kt"); doTest(fileName); } @TestMetadata("varOnUserType.kt") public void testVarOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/varOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/varOnUserType.kt"); doTest(fileName); } } @@ -2921,192 +2921,192 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractQuickFixTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createVariable/property"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callOnUserType.kt") public void testCallOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt"); doTest(fileName); } @TestMetadata("extensionRefInImport.kt") public void testExtensionRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionRefInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/extensionRefInImport.kt"); doTest(fileName); } @TestMetadata("inconsistentTypes.kt") public void testInconsistentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt"); doTest(fileName); } @TestMetadata("localValDelegateRuntime.kt") public void testLocalValDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/localValDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/localValDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("localValNoReceiver.kt") public void testLocalValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/localValNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberValDelegateRuntime.kt") public void testMemberValDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("memberValNoReceiver.kt") public void testMemberValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberValNoReceiver.kt"); doTest(fileName); } @TestMetadata("memberVarDelegateRuntime.kt") public void testMemberVarDelegateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/memberVarDelegateRuntime.kt"); doTest(fileName); } @TestMetadata("objectMemberValNoReceiver.kt") public void testObjectMemberValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/objectMemberValNoReceiver.kt"); doTest(fileName); } @TestMetadata("privateForMembers.kt") public void testPrivateForMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/privateForMembers.kt"); doTest(fileName); } @TestMetadata("qualifiedRefInStringTemplateRuntime.kt") public void testQualifiedRefInStringTemplateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt"); doTest(fileName); } @TestMetadata("quotedName.kt") public void testQuotedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/quotedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/quotedName.kt"); doTest(fileName); } @TestMetadata("recursiveBound.kt") public void testRecursiveBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/recursiveBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/recursiveBound.kt"); doTest(fileName); } @TestMetadata("refInImport.kt") public void testRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInImport.kt"); doTest(fileName); } @TestMetadata("refInStringTemplateRuntime.kt") public void testRefInStringTemplateRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/refInStringTemplateRuntime.kt"); doTest(fileName); } @TestMetadata("thisInClass.kt") public void testThisInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt"); doTest(fileName); } @TestMetadata("thisInExtension.kt") public void testThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass1.kt") public void testThisInNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt"); doTest(fileName); } @TestMetadata("thisInNestedClass2.kt") public void testThisInNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt"); doTest(fileName); } @TestMetadata("topLevelValNoReceiver.kt") public void testTopLevelValNoReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValNoReceiver.kt"); doTest(fileName); } @TestMetadata("topLevelValWithPackageName.kt") public void testTopLevelValWithPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/topLevelValWithPackageName.kt"); doTest(fileName); } @TestMetadata("valOnClassNoClassObject.kt") public void testValOnClassNoClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassNoClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassNoClassObject.kt"); doTest(fileName); } @TestMetadata("valOnClassObject.kt") public void testValOnClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt"); doTest(fileName); } @TestMetadata("valOnLibObject.kt") public void testValOnLibObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt"); doTest(fileName); } @TestMetadata("valOnLibType.kt") public void testValOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt"); doTest(fileName); } @TestMetadata("valOnUserObject.kt") public void testValOnUserObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt"); doTest(fileName); } @TestMetadata("valOnUserType.kt") public void testValOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt"); doTest(fileName); } @TestMetadata("valOnUserTypeWithTypeParams.kt") public void testValOnUserTypeWithTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt"); doTest(fileName); } @TestMetadata("valWithNullableType.kt") public void testValWithNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt"); doTest(fileName); } @TestMetadata("varOnLibType.kt") public void testVarOnLibType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt"); doTest(fileName); } @TestMetadata("varOnUserType.kt") public void testVarOnUserType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt"); doTest(fileName); } } @@ -3119,245 +3119,245 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class DeprecatedSymbolUsage extends AbstractQuickFixTest { @TestMetadata("addImplicitReceiverNested.kt") public void testAddImplicitReceiverNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/addImplicitReceiverNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/addImplicitReceiverNested.kt"); doTest(fileName); } public void testAllFilesPresentInDeprecatedSymbolUsage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("callChainBug.kt") public void testCallChainBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/callChainBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/callChainBug.kt"); doTest(fileName); } @TestMetadata("callWithError.kt") public void testCallWithError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt"); doTest(fileName); } @TestMetadata("changeThis1.kt") public void testChangeThis1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThis1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThis1.kt"); doTest(fileName); } @TestMetadata("changeThis2.kt") public void testChangeThis2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThis2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThis2.kt"); doTest(fileName); } @TestMetadata("changeThisToOuterThis.kt") public void testChangeThisToOuterThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThisToOuterThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/changeThisToOuterThis.kt"); doTest(fileName); } @TestMetadata("classLiteralAndTypeArgsRuntime.kt") public void testClassLiteralAndTypeArgsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classLiteralAndTypeArgsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classLiteralAndTypeArgsRuntime.kt"); doTest(fileName); } @TestMetadata("doNotShortenUserReferences.kt") public void testDoNotShortenUserReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.kt"); doTest(fileName); } @TestMetadata("doNotShortenUsersExplicitThis.kt") public void testDoNotShortenUsersExplicitThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.kt"); doTest(fileName); } @TestMetadata("dropReceiver.kt") public void testDropReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/dropReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/dropReceiver.kt"); doTest(fileName); } @TestMetadata("enumValues.kt") public void testEnumValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/enumValues.kt"); doTest(fileName); } @TestMetadata("extensionForGenericClass.kt") public void testExtensionForGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/extensionForGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/extensionForGenericClass.kt"); doTest(fileName); } @TestMetadata("implicitCompanionObjectThis.kt") public void testImplicitCompanionObjectThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/implicitCompanionObjectThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/implicitCompanionObjectThis.kt"); doTest(fileName); } @TestMetadata("implicitQualifiedThisRuntime.kt") public void testImplicitQualifiedThisRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/implicitQualifiedThisRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/implicitQualifiedThisRuntime.kt"); doTest(fileName); } @TestMetadata("incorrectArgs.kt") public void testIncorrectArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt"); doTest(fileName); } @TestMetadata("incorrectReplacement.kt") public void testIncorrectReplacement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/infixCall.kt"); doTest(fileName); } @TestMetadata("keepArgumentNamed.kt") public void testKeepArgumentNamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepArgumentNamed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepArgumentNamed.kt"); doTest(fileName); } @TestMetadata("keepInfixCall.kt") public void testKeepInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepInfixCall.kt"); doTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/localFun.kt"); doTest(fileName); } @TestMetadata("mailformedExpression.kt") public void testMailformedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/mailformedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/mailformedExpression.kt"); doTest(fileName); } @TestMetadata("memberFunction.kt") public void testMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunction.kt"); doTest(fileName); } @TestMetadata("memberFunctionImplicitReceiver.kt") public void testMemberFunctionImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionImplicitReceiver.kt"); doTest(fileName); } @TestMetadata("memberFunctionInGenericClass.kt") public void testMemberFunctionInGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionInGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionInGenericClass.kt"); doTest(fileName); } @TestMetadata("methodToProperty.kt") public void testMethodToProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/methodToProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/methodToProperty.kt"); doTest(fileName); } @TestMetadata("noReplacement.kt") public void testNoReplacement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt"); doTest(fileName); } @TestMetadata("operatorCall.kt") public void testOperatorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/operatorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/operatorCall.kt"); doTest(fileName); } @TestMetadata("operatorCall2.kt") public void testOperatorCall2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/operatorCall2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/operatorCall2.kt"); doTest(fileName); } @TestMetadata("parameters.kt") public void testParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/parameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/parameters.kt"); doTest(fileName); } @TestMetadata("propertyToMethod.kt") public void testPropertyToMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/propertyToMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/propertyToMethod.kt"); doTest(fileName); } @TestMetadata("propertyToSyntheticExtension.kt") public void testPropertyToSyntheticExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/propertyToSyntheticExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/propertyToSyntheticExtension.kt"); doTest(fileName); } @TestMetadata("replaceCallWithArgument.kt") public void testReplaceCallWithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/replaceCallWithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/replaceCallWithArgument.kt"); doTest(fileName); } @TestMetadata("replaceCallWithReceiver.kt") public void testReplaceCallWithReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/replaceCallWithReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/replaceCallWithReceiver.kt"); doTest(fileName); } @TestMetadata("shortenReferences.kt") public void testShortenReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/simple.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/stringTemplate.kt"); doTest(fileName); } @TestMetadata("toOuterClassMethod.kt") public void testToOuterClassMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/toOuterClassMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/toOuterClassMethod.kt"); doTest(fileName); } @TestMetadata("twoValuesCombined.kt") public void testTwoValuesCombined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/twoValuesCombined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/twoValuesCombined.kt"); doTest(fileName); } @TestMetadata("usageInDerivedClass.kt") public void testUsageInDerivedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/usageInDerivedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/usageInDerivedClass.kt"); doTest(fileName); } @TestMetadata("usageInDerivedClassGeneric.kt") public void testUsageInDerivedClassGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/usageInDerivedClassGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/usageInDerivedClassGeneric.kt"); doTest(fileName); } @@ -3366,120 +3366,120 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ArgumentSideEffects extends AbstractQuickFixTest { public void testAllFilesPresentInArgumentSideEffects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("complexExpressionNotUsed1.kt") public void testComplexExpressionNotUsed1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed1.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsed2.kt") public void testComplexExpressionNotUsed2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed2.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsed3Runtime.kt") public void testComplexExpressionNotUsed3Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed3Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed3Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsed4Runtime.kt") public void testComplexExpressionNotUsed4Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed4Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed4Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsed5Runtime.kt") public void testComplexExpressionNotUsed5Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed5Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsed5Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsedSafeCall.kt") public void testComplexExpressionNotUsedSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedSafeCall.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsedSafeCall2Runtime.kt") public void testComplexExpressionNotUsedSafeCall2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedSafeCall2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedSafeCall2Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionNotUsedShortenRefsRuntime.kt") public void testComplexExpressionNotUsedShortenRefsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedShortenRefsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionNotUsedShortenRefsRuntime.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice.kt") public void testComplexExpressionUsedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice2.kt") public void testComplexExpressionUsedTwice2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice2.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice3Runtime.kt") public void testComplexExpressionUsedTwice3Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice3Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice3Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice4.kt") public void testComplexExpressionUsedTwice4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice4.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice5Runtime.kt") public void testComplexExpressionUsedTwice5Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice5Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice5Runtime.kt"); doTest(fileName); } @TestMetadata("complexExpressionUsedTwice6Runtime.kt") public void testComplexExpressionUsedTwice6Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice6Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/complexExpressionUsedTwice6Runtime.kt"); doTest(fileName); } @TestMetadata("simpleExpressionNotUsed.kt") public void testSimpleExpressionNotUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/simpleExpressionNotUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/simpleExpressionNotUsed.kt"); doTest(fileName); } @TestMetadata("simpleExpressionUsedTwice.kt") public void testSimpleExpressionUsedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/simpleExpressionUsedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/simpleExpressionUsedTwice.kt"); doTest(fileName); } @TestMetadata("stringLiteralUsedTwice.kt") public void testStringLiteralUsedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringLiteralUsedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringLiteralUsedTwice.kt"); doTest(fileName); } @TestMetadata("stringTemplateUsedTwice.kt") public void testStringTemplateUsedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringTemplateUsedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringTemplateUsedTwice.kt"); doTest(fileName); } @TestMetadata("stringTemplateUsedTwice2.kt") public void testStringTemplateUsedTwice2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringTemplateUsedTwice2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/argumentSideEffects/stringTemplateUsedTwice2.kt"); doTest(fileName); } } @@ -3489,102 +3489,102 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassUsages extends AbstractQuickFixTest { public void testAllFilesPresentInClassUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("annotation1.kt") public void testAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation1.kt"); doTest(fileName); } @TestMetadata("annotation2.kt") public void testAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation2.kt"); doTest(fileName); } @TestMetadata("annotation3.kt") public void testAnnotation3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation3.kt"); doTest(fileName); } @TestMetadata("annotation4.kt") public void testAnnotation4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotation4.kt"); doTest(fileName); } @TestMetadata("annotationKeepNamedArgs.kt") public void testAnnotationKeepNamedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotationKeepNamedArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/annotationKeepNamedArgs.kt"); doTest(fileName); } @TestMetadata("constructorUsage1.kt") public void testConstructorUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage1.kt"); doTest(fileName); } @TestMetadata("constructorUsage2.kt") public void testConstructorUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage2.kt"); doTest(fileName); } @TestMetadata("constructorUsage3.kt") public void testConstructorUsage3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage3.kt"); doTest(fileName); } @TestMetadata("constructorUsage4.kt") public void testConstructorUsage4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/constructorUsage4.kt"); doTest(fileName); } @TestMetadata("imports.kt") public void testImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/imports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/imports.kt"); doTest(fileName); } @TestMetadata("inTypeArgument.kt") public void testInTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/inTypeArgument.kt"); doTest(fileName); } @TestMetadata("nestedClassToNestedClass.kt") public void testNestedClassToNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/nestedClassToNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/nestedClassToNestedClass.kt"); doTest(fileName); } @TestMetadata("noAnnotationConstructorUsage.kt") public void testNoAnnotationConstructorUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt"); doTest(fileName); } @TestMetadata("qualifiedClassName.kt") public void testQualifiedClassName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/qualifiedClassName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/qualifiedClassName.kt"); doTest(fileName); } @TestMetadata("qualifiedClassNameInPattern.kt") public void testQualifiedClassNameInPattern() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/qualifiedClassNameInPattern.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/qualifiedClassNameInPattern.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/simple.kt"); doTest(fileName); } @@ -3593,12 +3593,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class WholeProject extends AbstractQuickFixTest { public void testAllFilesPresentInWholeProject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inheritance.kt") public void testInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/inheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/classUsages/wholeProject/inheritance.kt"); doTest(fileName); } } @@ -3609,24 +3609,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiteralArguments extends AbstractQuickFixTest { public void testAllFilesPresentInFunctionLiteralArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("cannotKeepOutside.kt") public void testCannotKeepOutside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/cannotKeepOutside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/cannotKeepOutside.kt"); doTest(fileName); } @TestMetadata("keepInside.kt") public void testKeepInside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/keepInside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/keepInside.kt"); doTest(fileName); } @TestMetadata("keepOutside.kt") public void testKeepOutside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/keepOutside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/functionLiteralArguments/keepOutside.kt"); doTest(fileName); } } @@ -3637,12 +3637,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class Imports extends AbstractQuickFixTest { @TestMetadata("addImportRuntime.kt") public void testAddImportRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/imports/addImportRuntime.kt"); doTest(fileName); } public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/imports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/imports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } } @@ -3652,47 +3652,47 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class KeepComments extends AbstractQuickFixTest { @TestMetadata("addArguments.kt") public void testAddArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/addArguments.kt"); doTest(fileName); } public void testAllFilesPresentInKeepComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/keepComments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("commentBeforeArgument.kt") public void testCommentBeforeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/commentBeforeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/commentBeforeArgument.kt"); doTest(fileName); } @TestMetadata("dropArgument.kt") public void testDropArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/dropArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/dropArgument.kt"); doTest(fileName); } @TestMetadata("multipleArguments.kt") public void testMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/multipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/multipleArguments.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/simple.kt"); doTest(fileName); } @TestMetadata("usedTwice.kt") public void testUsedTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/usedTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/usedTwice.kt"); doTest(fileName); } @TestMetadata("variableForArgument.kt") public void testVariableForArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/variableForArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepComments/variableForArgument.kt"); doTest(fileName); } } @@ -3703,23 +3703,23 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class KeepLineBreaks extends AbstractQuickFixTest { @TestMetadata("addArgument.kt") public void testAddArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/addArgument.kt"); doTest(fileName); } public void testAllFilesPresentInKeepLineBreaks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("lineBreakAfterReceiverRuntime.kt") public void testLineBreakAfterReceiverRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/lineBreakAfterReceiverRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/lineBreakAfterReceiverRuntime.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/keepLineBreaks/simple.kt"); doTest(fileName); } } @@ -3729,72 +3729,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class OptionalParameters extends AbstractQuickFixTest { public void testAllFilesPresentInOptionalParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("dropAll.kt") public void testDropAll() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/dropAll.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/dropAll.kt"); doTest(fileName); } @TestMetadata("functionalLiteralArgument.kt") public void testFunctionalLiteralArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/functionalLiteralArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/functionalLiteralArgument.kt"); doTest(fileName); } @TestMetadata("namedArgument.kt") public void testNamedArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/namedArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/namedArgument.kt"); doTest(fileName); } @TestMetadata("optionalParameters1.kt") public void testOptionalParameters1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters1.kt"); doTest(fileName); } @TestMetadata("optionalParameters2.kt") public void testOptionalParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters2.kt"); doTest(fileName); } @TestMetadata("optionalParameters3.kt") public void testOptionalParameters3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters3.kt"); doTest(fileName); } @TestMetadata("optionalParameters4.kt") public void testOptionalParameters4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters4.kt"); doTest(fileName); } @TestMetadata("optionalParameters5.kt") public void testOptionalParameters5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters5.kt"); doTest(fileName); } @TestMetadata("optionalParameters7.kt") public void testOptionalParameters7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters7.kt"); doTest(fileName); } @TestMetadata("optionalParameters9.kt") public void testOptionalParameters9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters9.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/optionalParameters9.kt"); doTest(fileName); } @TestMetadata("overridingMethod.kt") public void testOverridingMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/overridingMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/optionalParameters/overridingMethod.kt"); doTest(fileName); } } @@ -3804,54 +3804,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class SafeCall extends AbstractQuickFixTest { public void testAllFilesPresentInSafeCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/safeCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/safeCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeThisSafeCall.kt") public void testChangeThisSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCall.kt"); doTest(fileName); } @TestMetadata("changeThisSafeCallWithValue1Runtime.kt") public void testChangeThisSafeCallWithValue1Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue1Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue1Runtime.kt"); doTest(fileName); } @TestMetadata("changeThisSafeCallWithValue2Runtime.kt") public void testChangeThisSafeCallWithValue2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue2Runtime.kt"); doTest(fileName); } @TestMetadata("changeThisSafeCallWithValue3Runtime.kt") public void testChangeThisSafeCallWithValue3Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue3Runtime.kt"); doTest(fileName); } @TestMetadata("changeThisSafeCallWithValue4Runtime.kt") public void testChangeThisSafeCallWithValue4Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValue4Runtime.kt"); doTest(fileName); } @TestMetadata("changeThisSafeCallWithValueRuntime.kt") public void testChangeThisSafeCallWithValueRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValueRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/changeThisSafeCallWithValueRuntime.kt"); doTest(fileName); } @TestMetadata("dropReceiverSafeCall.kt") public void testDropReceiverSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/dropReceiverSafeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/dropReceiverSafeCall.kt"); doTest(fileName); } @TestMetadata("safeCall.kt") public void testSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/safeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/safeCall/safeCall.kt"); doTest(fileName); } } @@ -3861,48 +3861,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeArguments extends AbstractQuickFixTest { public void testAllFilesPresentInTypeArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("emptyVarargRuntime.kt") public void testEmptyVarargRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/emptyVarargRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/emptyVarargRuntime.kt"); doTest(fileName); } @TestMetadata("explicitInPatternImplicitInUsage.kt") public void testExplicitInPatternImplicitInUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/explicitInPatternImplicitInUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/explicitInPatternImplicitInUsage.kt"); doTest(fileName); } @TestMetadata("explicitTypeArg.kt") public void testExplicitTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/explicitTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/explicitTypeArg.kt"); doTest(fileName); } @TestMetadata("keepInUserCodeRuntime.kt") public void testKeepInUserCodeRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/keepInUserCodeRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/keepInUserCodeRuntime.kt"); doTest(fileName); } @TestMetadata("keepOriginalIfQualified.kt") public void testKeepOriginalIfQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/keepOriginalIfQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/keepOriginalIfQualified.kt"); doTest(fileName); } @TestMetadata("noImplicitTypeArgImportRuntime.kt") public void testNoImplicitTypeArgImportRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/noImplicitTypeArgImportRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/noImplicitTypeArgImportRuntime.kt"); doTest(fileName); } @TestMetadata("nonEmptyVarargRuntime.kt") public void testNonEmptyVarargRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/nonEmptyVarargRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/typeArguments/nonEmptyVarargRuntime.kt"); doTest(fileName); } } @@ -3913,143 +3913,143 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class Vararg extends AbstractQuickFixTest { @TestMetadata("addedNamedArgumentAfterRuntime.kt") public void testAddedNamedArgumentAfterRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedNamedArgumentAfterRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedNamedArgumentAfterRuntime.kt"); doTest(fileName); } @TestMetadata("addedPositionalArgumentAfterRuntime.kt") public void testAddedPositionalArgumentAfterRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedPositionalArgumentAfterRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedPositionalArgumentAfterRuntime.kt"); doTest(fileName); } @TestMetadata("addedSpreadArgumentAfterRuntime.kt") public void testAddedSpreadArgumentAfterRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedSpreadArgumentAfterRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/addedSpreadArgumentAfterRuntime.kt"); doTest(fileName); } public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/vararg"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/deprecatedSymbolUsage/vararg"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("booleanArrayRuntime.kt") public void testBooleanArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/booleanArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/booleanArrayRuntime.kt"); doTest(fileName); } @TestMetadata("byteArrayRuntime.kt") public void testByteArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/byteArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/byteArrayRuntime.kt"); doTest(fileName); } @TestMetadata("doNotShortenUserReferences2Runtime.kt") public void testDoNotShortenUserReferences2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferences2Runtime.kt"); doTest(fileName); } @TestMetadata("doNotShortenUserReferencesRuntime.kt") public void testDoNotShortenUserReferencesRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotShortenUserReferencesRuntime.kt"); doTest(fileName); } @TestMetadata("doNotSimplifyOriginalCallRuntime.kt") public void testDoNotSimplifyOriginalCallRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotSimplifyOriginalCallRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doNotSimplifyOriginalCallRuntime.kt"); doTest(fileName); } @TestMetadata("doubleArrayRuntime.kt") public void testDoubleArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doubleArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/doubleArrayRuntime.kt"); doTest(fileName); } @TestMetadata("floatArrayRuntime.kt") public void testFloatArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/floatArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/floatArrayRuntime.kt"); doTest(fileName); } @TestMetadata("longArrayRuntime.kt") public void testLongArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/longArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/longArrayRuntime.kt"); doTest(fileName); } @TestMetadata("multipleSpreadArguments2Runtime.kt") public void testMultipleSpreadArguments2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/multipleSpreadArguments2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/multipleSpreadArguments2Runtime.kt"); doTest(fileName); } @TestMetadata("multipleSpreadArgumentsRuntime.kt") public void testMultipleSpreadArgumentsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/multipleSpreadArgumentsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/multipleSpreadArgumentsRuntime.kt"); doTest(fileName); } @TestMetadata("noImportRuntime.kt") public void testNoImportRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/noImportRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/noImportRuntime.kt"); doTest(fileName); } @TestMetadata("shortArrayRuntime.kt") public void testShortArrayRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/shortArrayRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/shortArrayRuntime.kt"); doTest(fileName); } @TestMetadata("vararg1Runtime.kt") public void testVararg1Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg1Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg1Runtime.kt"); doTest(fileName); } @TestMetadata("vararg2Runtime.kt") public void testVararg2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg2Runtime.kt"); doTest(fileName); } @TestMetadata("vararg3Runtime.kt") public void testVararg3Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg3Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg3Runtime.kt"); doTest(fileName); } @TestMetadata("vararg4.kt") public void testVararg4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg4.kt"); doTest(fileName); } @TestMetadata("vararg5.kt") public void testVararg5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg5.kt"); doTest(fileName); } @TestMetadata("vararg6Runtime.kt") public void testVararg6Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg6Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg6Runtime.kt"); doTest(fileName); } @TestMetadata("vararg7.kt") public void testVararg7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg7.kt"); doTest(fileName); } @TestMetadata("vararg8Runtime.kt") public void testVararg8Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg8Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/deprecatedSymbolUsage/vararg/vararg8Runtime.kt"); doTest(fileName); } } @@ -4061,102 +4061,102 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractQuickFixTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("fixNullableIterableGenericWithExclExcl.kt") public void testFixNullableIterableGenericWithExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableIterableGenericWithExclExcl.kt"); doTest(fileName); } @TestMetadata("fixNullableIterableWithExclExcl.kt") public void testFixNullableIterableWithExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableIterableWithExclExcl.kt"); doTest(fileName); } @TestMetadata("fixNullableWithExclExclAbsentWithBadIterator.kt") public void testFixNullableWithExclExclAbsentWithBadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt"); doTest(fileName); } @TestMetadata("fixNullableWithIteratorWithExclExcl.kt") public void testFixNullableWithIteratorWithExclExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/fixNullableWithIteratorWithExclExcl.kt"); doTest(fileName); } @TestMetadata("removeUselessCast.kt") public void testRemoveUselessCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCast.kt"); doTest(fileName); } @TestMetadata("removeUselessCastInParens.kt") public void testRemoveUselessCastInParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastInParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastInParens.kt"); doTest(fileName); } @TestMetadata("removeUselessCastUnderSmartCast.kt") public void testRemoveUselessCastUnderSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/removeUselessCastUnderSmartCast.kt"); doTest(fileName); } @TestMetadata("unnecessaryNonNullAssertion1.kt") public void testUnnecessaryNonNullAssertion1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion1.kt"); doTest(fileName); } @TestMetadata("unnecessaryNonNullAssertion2.kt") public void testUnnecessaryNonNullAssertion2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion2.kt"); doTest(fileName); } @TestMetadata("unnecessaryNonNullAssertion3.kt") public void testUnnecessaryNonNullAssertion3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessaryNonNullAssertion3.kt"); doTest(fileName); } @TestMetadata("unnecessarySafeCall1.kt") public void testUnnecessarySafeCall1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessarySafeCall1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unnecessarySafeCall1.kt"); doTest(fileName); } @TestMetadata("unsafeCall1.kt") public void testUnsafeCall1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall1.kt"); doTest(fileName); } @TestMetadata("unsafeCall2.kt") public void testUnsafeCall2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall2.kt"); doTest(fileName); } @TestMetadata("unsafeCall3.kt") public void testUnsafeCall3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/unsafeCall3.kt"); doTest(fileName); } @TestMetadata("uselessCastStaticAssertIsFine.kt") public void testUselessCastStaticAssertIsFine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessCastStaticAssertIsFine.kt"); doTest(fileName); } @TestMetadata("uselessElvis.kt") public void testUselessElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/expressions/uselessElvis.kt"); doTest(fileName); } } @@ -4166,54 +4166,54 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class InsertDelegationCall extends AbstractQuickFixTest { public void testAllFilesPresentInInsertDelegationCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/insertDelegationCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/insertDelegationCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("nonApplicableInsertSuper.kt") public void testNonApplicableInsertSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertSuper.kt"); doTest(fileName); } @TestMetadata("nonApplicableInsertThis.kt") public void testNonApplicableInsertThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableInsertThis.kt"); doTest(fileName); } @TestMetadata("nonApplicableOnEmpty.kt") public void testNonApplicableOnEmpty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableOnEmpty.kt"); doTest(fileName); } @TestMetadata("nonApplicableWithOneConstructor.kt") public void testNonApplicableWithOneConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableWithOneConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/nonApplicableWithOneConstructor.kt"); doTest(fileName); } @TestMetadata("primaryRequiredNoSuper.kt") public void testPrimaryRequiredNoSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredNoSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredNoSuper.kt"); doTest(fileName); } @TestMetadata("primaryRequiredParameterless.kt") public void testPrimaryRequiredParameterless() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredParameterless.kt"); doTest(fileName); } @TestMetadata("primaryRequiredWithBody.kt") public void testPrimaryRequiredWithBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithBody.kt"); doTest(fileName); } @TestMetadata("primaryRequiredWithParameter.kt") public void testPrimaryRequiredWithParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/insertDelegationCall/primaryRequiredWithParameter.kt"); doTest(fileName); } } @@ -4223,18 +4223,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Libraries extends AbstractQuickFixTest { public void testAllFilesPresentInLibraries() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/libraries"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/libraries"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("junit.kt") public void testJunit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/libraries/junit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/libraries/junit.kt"); doTest(fileName); } @TestMetadata("testNG.kt") public void testTestNG() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/libraries/testNG.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/libraries/testNG.kt"); doTest(fileName); } } @@ -4245,12 +4245,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class Migration extends AbstractQuickFixTest { @TestMetadata("addOverrideToEqualsHashCodeToString.kt") public void testAddOverrideToEqualsHashCodeToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/addOverrideToEqualsHashCodeToString.kt"); doTest(fileName); } public void testAllFilesPresentInMigration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/migration/addTypeToLHSOfCallableReference") @@ -4258,12 +4258,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddTypeToLHSOfCallableReference extends AbstractQuickFixTest { public void testAllFilesPresentInAddTypeToLHSOfCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/addTypeToLHSOfCallableReference"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/addTypeToLHSOfCallableReference"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("member.kt") public void testMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/addTypeToLHSOfCallableReference/member.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/addTypeToLHSOfCallableReference/member.kt"); doTest(fileName); } } @@ -4273,90 +4273,90 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConflictingExtension extends AbstractQuickFixTest { public void testAllFilesPresentInConflictingExtension() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/conflictingExtension"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/conflictingExtension"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("explicitThis.kt") public void testExplicitThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/explicitThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/explicitThis.kt"); doTest(fileName); } @TestMetadata("markHiddenAndDeprecated.kt") public void testMarkHiddenAndDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/markHiddenAndDeprecated.kt"); doTest(fileName); } @TestMetadata("memberExtension.kt") public void testMemberExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/memberExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/memberExtension.kt"); doTest(fileName); } @TestMetadata("returnInGetter.kt") public void testReturnInGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/returnInGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/returnInGetter.kt"); doTest(fileName); } @TestMetadata("setterWithExpressionBody.kt") public void testSetterWithExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/setterWithExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/setterWithExpressionBody.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/simple.kt"); doTest(fileName); } @TestMetadata("valInsteadOfVar.kt") public void testValInsteadOfVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/valInsteadOfVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/valInsteadOfVar.kt"); doTest(fileName); } @TestMetadata("varInsteadOfVal.kt") public void testVarInsteadOfVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/varInsteadOfVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/varInsteadOfVal.kt"); doTest(fileName); } @TestMetadata("withSetter.kt") public void testWithSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/withSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/withSetter.kt"); doTest(fileName); } @TestMetadata("wrongExplicitThis.kt") public void testWrongExplicitThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis.kt"); doTest(fileName); } @TestMetadata("wrongExplicitThis2.kt") public void testWrongExplicitThis2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongExplicitThis2.kt"); doTest(fileName); } @TestMetadata("wrongGetter.kt") public void testWrongGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongGetter.kt"); doTest(fileName); } @TestMetadata("wrongGetter2.kt") public void testWrongGetter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongGetter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongGetter2.kt"); doTest(fileName); } @TestMetadata("wrongSetter.kt") public void testWrongSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/conflictingExtension/wrongSetter.kt"); doTest(fileName); } } @@ -4366,12 +4366,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class MissingConstructorKeyword extends AbstractQuickFixTest { public void testAllFilesPresentInMissingConstructorKeyword() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/missingConstructorKeyword"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/missingConstructorKeyword"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/missingConstructorKeyword/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/missingConstructorKeyword/basic.kt"); doTest(fileName); } } @@ -4381,18 +4381,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ObsoleteLabelSyntax extends AbstractQuickFixTest { public void testAllFilesPresentInObsoleteLabelSyntax() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/obsoleteLabelSyntax"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/obsoleteLabelSyntax"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/lambda.kt"); doTest(fileName); } @TestMetadata("loop.kt") public void testLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/loop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/obsoleteLabelSyntax/loop.kt"); doTest(fileName); } } @@ -4402,12 +4402,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveNameFromFunctionExpression extends AbstractQuickFixTest { public void testAllFilesPresentInRemoveNameFromFunctionExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/removeNameFromFunctionExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/removeNameFromFunctionExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/removeNameFromFunctionExpression/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/removeNameFromFunctionExpression/basic.kt"); doTest(fileName); } } @@ -4417,18 +4417,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameterList extends AbstractQuickFixTest { public void testAllFilesPresentInTypeParameterList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/typeParameterList"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/migration/typeParameterList"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/typeParameterList/basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/typeParameterList/basic.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/typeParameterList/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/migration/typeParameterList/extension.kt"); doTest(fileName); } } @@ -4440,233 +4440,233 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class Modifiers extends AbstractQuickFixTest { @TestMetadata("abstractModifierInEnum.kt") public void testAbstractModifierInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/abstractModifierInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/abstractModifierInEnum.kt"); doTest(fileName); } public void testAllFilesPresentInModifiers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("cannotMakeClassAnnotation.kt") public void testCannotMakeClassAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/cannotMakeClassAnnotation.kt"); doTest(fileName); } @TestMetadata("deprecatedDelegatesGetSetExtension.kt") public void testDeprecatedDelegatesGetSetExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/deprecatedDelegatesGetSetExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/deprecatedDelegatesGetSetExtension.kt"); doTest(fileName); } @TestMetadata("deprecatedDelegatesGetSetMember.kt") public void testDeprecatedDelegatesGetSetMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/deprecatedDelegatesGetSetMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/deprecatedDelegatesGetSetMember.kt"); doTest(fileName); } @TestMetadata("finalTrait.kt") public void testFinalTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/finalTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/finalTrait.kt"); doTest(fileName); } @TestMetadata("illegalEnumAnnotation1.kt") public void testIllegalEnumAnnotation1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation1.kt"); doTest(fileName); } @TestMetadata("illegalEnumAnnotation2.kt") public void testIllegalEnumAnnotation2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/illegalEnumAnnotation2.kt"); doTest(fileName); } @TestMetadata("infixModifier.kt") public void testInfixModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/infixModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/infixModifier.kt"); doTest(fileName); } @TestMetadata("nestedClassNotAllowed.kt") public void testNestedClassNotAllowed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt"); doTest(fileName); } @TestMetadata("noAbstractForAnonymousObject.kt") public void testNoAbstractForAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/noAbstractForAnonymousObject.kt"); doTest(fileName); } @TestMetadata("noAbstractForObject.kt") public void testNoAbstractForObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/noAbstractForObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/noAbstractForObject.kt"); doTest(fileName); } @TestMetadata("notAnAnnotationClass.kt") public void testNotAnAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/notAnAnnotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/notAnAnnotationClass.kt"); doTest(fileName); } @TestMetadata("openMemberInFinalClass1.kt") public void testOpenMemberInFinalClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt"); doTest(fileName); } @TestMetadata("openMemberInFinalClass2.kt") public void testOpenMemberInFinalClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt"); doTest(fileName); } @TestMetadata("openMemberInFinalClass3.kt") public void testOpenMemberInFinalClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt"); doTest(fileName); } @TestMetadata("openMemberInFinalClass4.kt") public void testOpenMemberInFinalClass4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt"); doTest(fileName); } @TestMetadata("openModifierInEnum.kt") public void testOpenModifierInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openModifierInEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/openModifierInEnum.kt"); doTest(fileName); } @TestMetadata("operatorModifier.kt") public void testOperatorModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifier.kt"); doTest(fileName); } @TestMetadata("operatorModifierCollection.kt") public void testOperatorModifierCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierCollection.kt"); doTest(fileName); } @TestMetadata("operatorModifierComponent.kt") public void testOperatorModifierComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierComponent.kt"); doTest(fileName); } @TestMetadata("operatorModifierGet.kt") public void testOperatorModifierGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierGet.kt"); doTest(fileName); } @TestMetadata("operatorModifierInherited.kt") public void testOperatorModifierInherited() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierInherited.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/operatorModifierInherited.kt"); doTest(fileName); } @TestMetadata("packageMemberCannotBeProtected.kt") public void testPackageMemberCannotBeProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/packageMemberCannotBeProtected.kt"); doTest(fileName); } @TestMetadata("removeAbstractModifier.kt") public void testRemoveAbstractModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeAbstractModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeAbstractModifier.kt"); doTest(fileName); } @TestMetadata("removeIncompatibleModifier.kt") public void testRemoveIncompatibleModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeIncompatibleModifier.kt"); doTest(fileName); } @TestMetadata("removeInnerForClassInTrait.kt") public void testRemoveInnerForClassInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeInnerForClassInTrait.kt"); doTest(fileName); } @TestMetadata("removeProtectedModifier.kt") public void testRemoveProtectedModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeProtectedModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeProtectedModifier.kt"); doTest(fileName); } @TestMetadata("removeRedundantModifier1.kt") public void testRemoveRedundantModifier1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier1.kt"); doTest(fileName); } @TestMetadata("removeRedundantModifier2.kt") public void testRemoveRedundantModifier2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier2.kt"); doTest(fileName); } @TestMetadata("removeRedundantModifier3.kt") public void testRemoveRedundantModifier3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeRedundantModifier3.kt"); doTest(fileName); } @TestMetadata("removeSupertype1.kt") public void testRemoveSupertype1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype1.kt"); doTest(fileName); } @TestMetadata("removeSupertype2.kt") public void testRemoveSupertype2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype2.kt"); doTest(fileName); } @TestMetadata("removeSupertype3.kt") public void testRemoveSupertype3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype3.kt"); doTest(fileName); } @TestMetadata("removeSupertype4.kt") public void testRemoveSupertype4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/removeSupertype4.kt"); doTest(fileName); } @TestMetadata("visibilityModifer1.kt") public void testVisibilityModifer1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer1.kt"); doTest(fileName); } @TestMetadata("visibilityModifer2.kt") public void testVisibilityModifer2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModifer2.kt"); doTest(fileName); } @TestMetadata("visibilityModiferOverrideJavaRuntime.kt") public void testVisibilityModiferOverrideJavaRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModiferOverrideJavaRuntime.kt"); doTest(fileName); } @TestMetadata("visibilityModiferParameter.kt") public void testVisibilityModiferParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModiferParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/visibilityModiferParameter.kt"); doTest(fileName); } @@ -4675,78 +4675,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("enumSupertype.kt") public void testEnumSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumSupertype.kt"); doTest(fileName); } @TestMetadata("enumUpperBound.kt") public void testEnumUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/enumUpperBound.kt"); doTest(fileName); } @TestMetadata("explicitlyFinalSupertype.kt") public void testExplicitlyFinalSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalSupertype.kt"); doTest(fileName); } @TestMetadata("explicitlyFinalUpperBound.kt") public void testExplicitlyFinalUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/explicitlyFinalUpperBound.kt"); doTest(fileName); } @TestMetadata("finalLibrarySupertype.kt") public void testFinalLibrarySupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibrarySupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibrarySupertype.kt"); doTest(fileName); } @TestMetadata("finalLibraryUpperBound.kt") public void testFinalLibraryUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibraryUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalLibraryUpperBound.kt"); doTest(fileName); } @TestMetadata("finalSupertype.kt") public void testFinalSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalSupertype.kt"); doTest(fileName); } @TestMetadata("finalUpperBound.kt") public void testFinalUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalUpperBound.kt"); doTest(fileName); } @TestMetadata("implementTraitFinalSupertype.kt") public void testImplementTraitFinalSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/implementTraitFinalSupertype.kt"); doTest(fileName); } @TestMetadata("secondaryCtrDelegationInHeader.kt") public void testSecondaryCtrDelegationInHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInHeader.kt"); doTest(fileName); } @TestMetadata("secondaryCtrDelegationInSecondary.kt") public void testSecondaryCtrDelegationInSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/secondaryCtrDelegationInSecondary.kt"); doTest(fileName); } @TestMetadata("withConstructor.kt") public void testWithConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/withConstructor.kt"); doTest(fileName); } @@ -4755,7 +4755,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @@ -4763,7 +4763,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixTest { public void testAllFilesPresentInJavaCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } } @@ -4776,30 +4776,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixTest { public void testAllFilesPresentInNullables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("removeRedundantNullable.kt") public void testRemoveRedundantNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeRedundantNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeRedundantNullable.kt"); doTest(fileName); } @TestMetadata("removeSupertypeNullable1.kt") public void testRemoveSupertypeNullable1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable1.kt"); doTest(fileName); } @TestMetadata("removeSupertypeNullable2.kt") public void testRemoveSupertypeNullable2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeSupertypeNullable2.kt"); doTest(fileName); } @TestMetadata("removeUselessNullable.kt") public void testRemoveUselessNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeUselessNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/removeUselessNullable.kt"); doTest(fileName); } @@ -4808,12 +4808,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class UnsafeInfixCall extends AbstractQuickFixTest { public void testAllFilesPresentInUnsafeInfixCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("unsafeInfixCall.kt") public void testUnsafeInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt"); doTest(fileName); } } @@ -4824,12 +4824,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class OptimizeImports extends AbstractQuickFixTest { public void testAllFilesPresentInOptimizeImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/optimizeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("fileRuntime.kt") public void testFileRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/optimizeImports/fileRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/optimizeImports/fileRuntime.kt"); doTest(fileName); } } @@ -4839,96 +4839,96 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixTest { public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeToInvocation.kt") public void testChangeToInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/changeToInvocation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/changeToInvocation.kt"); doTest(fileName); } @TestMetadata("implementMember.kt") public void testImplementMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMember.kt"); doTest(fileName); } @TestMetadata("implementMemberFromAbstractClass.kt") public void testImplementMemberFromAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMemberFromAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/implementMemberFromAbstractClass.kt"); doTest(fileName); } @TestMetadata("overriddingMultipleFinalMethods.kt") public void testOverriddingMultipleFinalMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overriddingMultipleFinalMethods.kt"); doTest(fileName); } @TestMetadata("overridingDelegatedMethod.kt") public void testOverridingDelegatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingDelegatedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingDelegatedMethod.kt"); doTest(fileName); } @TestMetadata("overridingFakeOverride.kt") public void testOverridingFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFakeOverride.kt"); doTest(fileName); } @TestMetadata("overridingFinalJavaMethod.kt") public void testOverridingFinalJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalJavaMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalJavaMethod.kt"); doTest(fileName); } @TestMetadata("overridingFinalMethod.kt") public void testOverridingFinalMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethod.kt"); doTest(fileName); } @TestMetadata("overridingFinalMethodInLocal.kt") public void testOverridingFinalMethodInLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethodInLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalMethodInLocal.kt"); doTest(fileName); } @TestMetadata("overridingFinalProperty.kt") public void testOverridingFinalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingFinalProperty.kt"); doTest(fileName); } @TestMetadata("overridingWritableAndNotWritableFinalMembers.kt") public void testOverridingWritableAndNotWritableFinalMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/overridingWritableAndNotWritableFinalMembers.kt"); doTest(fileName); } @TestMetadata("parameterNameChangedAmbiguousRename.kt") public void testParameterNameChangedAmbiguousRename() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedAmbiguousRename.kt"); doTest(fileName); } @TestMetadata("parameterNameChangedMultipleOverrideRenamePossible.kt") public void testParameterNameChangedMultipleOverrideRenamePossible() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedMultipleOverrideRenamePossible.kt"); doTest(fileName); } @TestMetadata("parameterNameChangedRenamePossible.kt") public void testParameterNameChangedRenamePossible() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/parameterNameChangedRenamePossible.kt"); doTest(fileName); } @TestMetadata("virtualMethodHidden.kt") public void testVirtualMethodHidden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/virtualMethodHidden.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/virtualMethodHidden.kt"); doTest(fileName); } @@ -4938,191 +4938,191 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class NothingToOverride extends AbstractQuickFixTest { @TestMetadata("addFunction.kt") public void testAddFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunction.kt"); doTest(fileName); } @TestMetadata("addFunctionAbstractClass.kt") public void testAddFunctionAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionAbstractClass.kt"); doTest(fileName); } @TestMetadata("addFunctionInLocalDeclaration.kt") public void testAddFunctionInLocalDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt"); doTest(fileName); } @TestMetadata("addFunctionNoBody.kt") public void testAddFunctionNoBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNoBody.kt"); doTest(fileName); } @TestMetadata("addFunctionNonUnitReturnType.kt") public void testAddFunctionNonUnitReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt"); doTest(fileName); } @TestMetadata("addFunctionTrait.kt") public void testAddFunctionTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTrait.kt"); doTest(fileName); } @TestMetadata("addFunctionTwoSuperclasses.kt") public void testAddFunctionTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt"); doTest(fileName); } @TestMetadata("addFunctionTwoTraits.kt") public void testAddFunctionTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addFunctionTwoTraits.kt"); doTest(fileName); } @TestMetadata("addParameter.kt") public void testAddParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameter.kt"); doTest(fileName); } @TestMetadata("addParameterGenericClass.kt") public void testAddParameterGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterGenericClass.kt"); doTest(fileName); } @TestMetadata("addParameterMultiple.kt") public void testAddParameterMultiple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterMultiple.kt"); doTest(fileName); } @TestMetadata("addParameterPreserveVisibility.kt") public void testAddParameterPreserveVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterPreserveVisibility.kt"); doTest(fileName); } @TestMetadata("addParameterTwoSupertraits.kt") public void testAddParameterTwoSupertraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertraits.kt"); doTest(fileName); } @TestMetadata("addParameterTwoSupertypes.kt") public void testAddParameterTwoSupertypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/addParameterTwoSupertypes.kt"); doTest(fileName); } public void testAllFilesPresentInNothingToOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeParameterType.kt") public void testChangeParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterType.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeAbstractSuperclass.kt") public void testChangeParameterTypeAbstractSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeAbstractSuperclass.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeInTrait.kt") public void testChangeParameterTypeInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeInTrait.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeMatchNames.kt") public void testChangeParameterTypeMatchNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeMatchNames.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeModifyOrder.kt") public void testChangeParameterTypeModifyOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeModifyOrder.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeOpenOverride.kt") public void testChangeParameterTypeOpenOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeOpenOverride.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeSingleExpressionFunction.kt") public void testChangeParameterTypeSingleExpressionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSingleExpressionFunction.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeSuperTrait.kt") public void testChangeParameterTypeSuperTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeParameterTypeSuperTrait.kt"); doTest(fileName); } @TestMetadata("changeReturnType.kt") public void testChangeReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/changeReturnType.kt"); doTest(fileName); } @TestMetadata("doNotLooseAnnotations.kt") public void testDoNotLooseAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/doNotLooseAnnotations.kt"); doTest(fileName); } @TestMetadata("noDefaultValuesInOverride.kt") public void testNoDefaultValuesInOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/noDefaultValuesInOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/noDefaultValuesInOverride.kt"); doTest(fileName); } @TestMetadata("noOpenSuperFunction.kt") public void testNoOpenSuperFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/noOpenSuperFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/noOpenSuperFunction.kt"); doTest(fileName); } @TestMetadata("overrideJavaMethod.kt") public void testOverrideJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/overrideJavaMethod.kt"); doTest(fileName); } @TestMetadata("removeOverride.kt") public void testRemoveOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeOverride.kt"); doTest(fileName); } @TestMetadata("removeParameter.kt") public void testRemoveParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameter.kt"); doTest(fileName); } @TestMetadata("removeParameterTwoTraits.kt") public void testRemoveParameterTwoTraits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/removeParameterTwoTraits.kt"); doTest(fileName); } @TestMetadata("swapParametersGenericClass.kt") public void testSwapParametersGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/swapParametersGenericClass.kt"); doTest(fileName); } } @@ -5132,114 +5132,114 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeMismatchOnOverride extends AbstractQuickFixTest { public void testAllFilesPresentInTypeMismatchOnOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("cantChangeMultipleOverriddenPropertiesTypes.kt") public void testCantChangeMultipleOverriddenPropertiesTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeMultipleOverriddenPropertiesTypes.kt"); doTest(fileName); } @TestMetadata("cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt") public void testCantChangeOverriddenPropertyTypeToMatchOverridingProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt"); doTest(fileName); } @TestMetadata("cantChangePropertyTypeToMatchOverridenProperties.kt") public void testCantChangePropertyTypeToMatchOverridenProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangePropertyTypeToMatchOverridenProperties.kt"); doTest(fileName); } @TestMetadata("cantChangeReturnTypeOfOverriddenFunction.kt") public void testCantChangeReturnTypeOfOverriddenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt"); doTest(fileName); } @TestMetadata("changeOverriddenPropertyType1.kt") public void testChangeOverriddenPropertyType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType1.kt"); doTest(fileName); } @TestMetadata("changeOverriddenPropertyType2.kt") public void testChangeOverriddenPropertyType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverriddenPropertyType2.kt"); doTest(fileName); } @TestMetadata("changeOverridingPropertyTypeToFunctionType.kt") public void testChangeOverridingPropertyTypeToFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeOverridingPropertyTypeToFunctionType.kt"); doTest(fileName); } @TestMetadata("changeReturnTypeOfOverriddenFunction.kt") public void testChangeReturnTypeOfOverriddenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/changeReturnTypeOfOverriddenFunction.kt"); doTest(fileName); } @TestMetadata("namedFunctionReturnOverrideInsideVariableInitializer.kt") public void testNamedFunctionReturnOverrideInsideVariableInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/namedFunctionReturnOverrideInsideVariableInitializer.kt"); doTest(fileName); } @TestMetadata("objectInsideBody.kt") public void testObjectInsideBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/objectInsideBody.kt"); doTest(fileName); } @TestMetadata("propertyReturnTypeMismatchOnOverride.kt") public void testPropertyReturnTypeMismatchOnOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyReturnTypeMismatchOnOverride.kt"); doTest(fileName); } @TestMetadata("propertyTypeMismatchOnOverrideIntLong.kt") public void testPropertyTypeMismatchOnOverrideIntLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntLong.kt"); doTest(fileName); } @TestMetadata("propertyTypeMismatchOnOverrideIntUnit.kt") public void testPropertyTypeMismatchOnOverrideIntUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/propertyTypeMismatchOnOverrideIntUnit.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatchOnMultipleOverride.kt") public void testReturnTypeMismatchOnMultipleOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverride.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatchOnMultipleOverrideAmbiguity.kt") public void testReturnTypeMismatchOnMultipleOverrideAmbiguity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnMultipleOverrideAmbiguity.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatchOnOverrideIntLong.kt") public void testReturnTypeMismatchOnOverrideIntLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntLong.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatchOnOverrideIntUnit.kt") public void testReturnTypeMismatchOnOverrideIntUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideIntUnit.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatchOnOverrideUnitInt.kt") public void testReturnTypeMismatchOnOverrideUnitInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/returnTypeMismatchOnOverrideUnitInt.kt"); doTest(fileName); } } @@ -5250,30 +5250,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class PlatformClasses extends AbstractQuickFixTest { public void testAllFilesPresentInPlatformClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("mapPlatformClassToKotlin1.kt") public void testMapPlatformClassToKotlin1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin1.kt"); doTest(fileName); } @TestMetadata("mapPlatformClassToKotlin2.kt") public void testMapPlatformClassToKotlin2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin2.kt"); doTest(fileName); } @TestMetadata("mapPlatformClassToKotlin3.kt") public void testMapPlatformClassToKotlin3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin3.kt"); doTest(fileName); } @TestMetadata("mapPlatformClassToKotlin4.kt") public void testMapPlatformClassToKotlin4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/mapPlatformClassToKotlin4.kt"); doTest(fileName); } } @@ -5283,36 +5283,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveUnused extends AbstractQuickFixTest { public void testAllFilesPresentInRemoveUnused() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnused"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnused"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("unusedClass.kt") public void testUnusedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedClass.kt"); doTest(fileName); } @TestMetadata("unusedFunction.kt") public void testUnusedFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedFunction.kt"); doTest(fileName); } @TestMetadata("unusedProperty.kt") public void testUnusedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedProperty.kt"); doTest(fileName); } @TestMetadata("unusedPropertyAsConstructorParameter.kt") public void testUnusedPropertyAsConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedPropertyAsConstructorParameter.kt"); doTest(fileName); } @TestMetadata("unusedTypeParameter.kt") public void testUnusedTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnused/unusedTypeParameter.kt"); doTest(fileName); } } @@ -5322,18 +5322,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveUnusedReceiver extends AbstractQuickFixTest { public void testAllFilesPresentInRemoveUnusedReceiver() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnusedReceiver"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/removeUnusedReceiver"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inFunction.kt") public void testInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inFunction.kt"); doTest(fileName); } @TestMetadata("inProperty.kt") public void testInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/removeUnusedReceiver/inProperty.kt"); doTest(fileName); } } @@ -5343,12 +5343,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Supercalls extends AbstractQuickFixTest { public void testAllFilesPresentInSupercalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("typeArgumentsRedundantInSuperQualifier.kt") public void testTypeArgumentsRedundantInSuperQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supercalls/typeArgumentsRedundantInSuperQualifier.kt"); doTest(fileName); } } @@ -5359,137 +5359,137 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class SupertypeInitialization extends AbstractQuickFixTest { @TestMetadata("addImport.kt") public void testAddImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addImport.kt"); doTest(fileName); } @TestMetadata("addParameters.kt") public void testAddParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParameters.kt"); doTest(fileName); } @TestMetadata("addParenthesis.kt") public void testAddParenthesis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesis.kt"); doTest(fileName); } @TestMetadata("addParenthesisDefaultParameters.kt") public void testAddParenthesisDefaultParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisDefaultParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisDefaultParameters.kt"); doTest(fileName); } @TestMetadata("addParenthesisEmptyConstructor.kt") public void testAddParenthesisEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisEmptyConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisEmptyConstructor.kt"); doTest(fileName); } @TestMetadata("addParenthesisForLocalClass.kt") public void testAddParenthesisForLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisForLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisForLocalClass.kt"); doTest(fileName); } @TestMetadata("addParenthesisForObjectExpression.kt") public void testAddParenthesisForObjectExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisForObjectExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/addParenthesisForObjectExpression.kt"); doTest(fileName); } public void testAllFilesPresentInSupertypeInitialization() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("baseConstructorError.kt") public void testBaseConstructorError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/baseConstructorError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/baseConstructorError.kt"); doTest(fileName); } @TestMetadata("createConstructor.kt") public void testCreateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/createConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/createConstructor.kt"); doTest(fileName); } @TestMetadata("displayLongSignatures1.kt") public void testDisplayLongSignatures1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/displayLongSignatures1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/displayLongSignatures1.kt"); doTest(fileName); } @TestMetadata("displayLongSignatures2.kt") public void testDisplayLongSignatures2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/displayLongSignatures2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/displayLongSignatures2.kt"); doTest(fileName); } @TestMetadata("genericClass.kt") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/genericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/genericClass.kt"); doTest(fileName); } @TestMetadata("incompleteConstructor.kt") public void testIncompleteConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/incompleteConstructor.kt"); doTest(fileName); } @TestMetadata("keywordName.kt") public void testKeywordName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/keywordName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/keywordName.kt"); doTest(fileName); } @TestMetadata("multipleConstructors.kt") public void testMultipleConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/multipleConstructors.kt"); doTest(fileName); } @TestMetadata("noAccessibleConstructors.kt") public void testNoAccessibleConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/noAccessibleConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/noAccessibleConstructors.kt"); doTest(fileName); } @TestMetadata("noParameters.kt") public void testNoParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/noParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/noParameters.kt"); doTest(fileName); } @TestMetadata("primaryConstructorInaccessible.kt") public void testPrimaryConstructorInaccessible() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/primaryConstructorInaccessible.kt"); doTest(fileName); } @TestMetadata("someParametersAlreadyExist.kt") public void testSomeParametersAlreadyExist() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/someParametersAlreadyExist.kt"); doTest(fileName); } @TestMetadata("vararg1.kt") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg1.kt"); doTest(fileName); } @TestMetadata("vararg2.kt") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg2.kt"); doTest(fileName); } @TestMetadata("vararg3.kt") public void testVararg3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/vararg3.kt"); doTest(fileName); } } @@ -5499,7 +5499,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixTest { public void testAllFilesPresentInSuppress() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("idea/testData/quickfix/suppress/annotationPosition") @@ -5507,78 +5507,78 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationPosition extends AbstractQuickFixTest { public void testAllFilesPresentInAnnotationPosition() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("paramWithModifier.kt") public void testParamWithModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/paramWithModifier.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionModifierOnThePreviousLine.kt") public void testTopLevelFunctionModifierOnThePreviousLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnThePreviousLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionModifierOnTheSameLine.kt") public void testTopLevelFunctionModifierOnTheSameLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionModifierOnTheSameLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionNoModifiers.kt") public void testTopLevelFunctionNoModifiers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionNoModifiers.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressAnotherPreviousLine.kt") public void testTopLevelFunctionSuppressAnotherPreviousLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressAnotherPreviousLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressEmptyArgsPreviousLine.kt") public void testTopLevelFunctionSuppressEmptyArgsPreviousLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressEmptyArgsPreviousLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressNoArgsPreviousLine.kt") public void testTopLevelFunctionSuppressNoArgsPreviousLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressNoArgsPreviousLineBare.kt") public void testTopLevelFunctionSuppressNoArgsPreviousLineBare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsPreviousLineBare.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressNoArgsTheSameLine.kt") public void testTopLevelFunctionSuppressNoArgsTheSameLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLine.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionSuppressNoArgsTheSameLineBare.kt") public void testTopLevelFunctionSuppressNoArgsTheSameLineBare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionSuppressNoArgsTheSameLineBare.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionUnrelatedAnnotation.kt") public void testTopLevelFunctionUnrelatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotation.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionUnrelatedAnnotationBare.kt") public void testTopLevelFunctionUnrelatedAnnotationBare() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/topLevelFunctionUnrelatedAnnotationBare.kt"); doTest(fileName); } } @@ -5588,66 +5588,66 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Availability extends AbstractQuickFixTest { public void testAllFilesPresentInAvailability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("localFunSuppressForLocal.kt") public void testLocalFunSuppressForLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForLocal.kt"); doTest(fileName); } @TestMetadata("localFunSuppressForOuter.kt") public void testLocalFunSuppressForOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localFunSuppressForOuter.kt"); doTest(fileName); } @TestMetadata("localValSuppressForFun.kt") public void testLocalValSuppressForFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForFun.kt"); doTest(fileName); } @TestMetadata("localValSuppressForVal.kt") public void testLocalValSuppressForVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/localValSuppressForVal.kt"); doTest(fileName); } @TestMetadata("memberOfNestedSuppressForMember.kt") public void testMemberOfNestedSuppressForMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForMember.kt"); doTest(fileName); } @TestMetadata("memberOfNestedSuppressForNested.kt") public void testMemberOfNestedSuppressForNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForNested.kt"); doTest(fileName); } @TestMetadata("memberOfNestedSuppressForOuter.kt") public void testMemberOfNestedSuppressForOuter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberOfNestedSuppressForOuter.kt"); doTest(fileName); } @TestMetadata("memberSuppressForClass.kt") public void testMemberSuppressForClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForClass.kt"); doTest(fileName); } @TestMetadata("memberSuppressForMember.kt") public void testMemberSuppressForMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/memberSuppressForMember.kt"); doTest(fileName); } @TestMetadata("topLevelFunctionAlreadySuppressed.kt") public void testTopLevelFunctionAlreadySuppressed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/topLevelFunctionAlreadySuppressed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/topLevelFunctionAlreadySuppressed.kt"); doTest(fileName); } } @@ -5657,72 +5657,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationKinds extends AbstractQuickFixTest { public void testAllFilesPresentInDeclarationKinds() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/class.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/classObject.kt"); doTest(fileName); } @TestMetadata("enumEntry.kt") public void testEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/enumEntry.kt"); doTest(fileName); } @TestMetadata("fun.kt") public void testFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/fun.kt"); doTest(fileName); } @TestMetadata("multiVal.kt") public void testMultiVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVal.kt"); doTest(fileName); } @TestMetadata("multiVar.kt") public void testMultiVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/multiVar.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/object.kt"); doTest(fileName); } @TestMetadata("param.kt") public void testParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/param.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/param.kt"); doTest(fileName); } @TestMetadata("trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/trait.kt"); doTest(fileName); } @TestMetadata("val.kt") public void testVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/val.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/val.kt"); doTest(fileName); } @TestMetadata("var.kt") public void testVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/var.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/var.kt"); doTest(fileName); } } @@ -5732,18 +5732,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ErrorRecovery extends AbstractQuickFixTest { public void testAllFilesPresentInErrorRecovery() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("nonStringInSuppress.kt") public void testNonStringInSuppress() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/nonStringInSuppress.kt"); doTest(fileName); } @TestMetadata("unresolvedAnnotation.kt") public void testUnresolvedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/unresolvedAnnotation.kt"); doTest(fileName); } } @@ -5753,234 +5753,234 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixTest { public void testAllFilesPresentInForStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("andAnd.kt") public void testAndAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/andAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/andAnd.kt"); doTest(fileName); } @TestMetadata("annotatedExpr.kt") public void testAnnotatedExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExpr.kt"); doTest(fileName); } @TestMetadata("annotatedExprWithSuppress.kt") public void testAnnotatedExprWithSuppress() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/annotatedExprWithSuppress.kt"); doTest(fileName); } @TestMetadata("arrayRead.kt") public void testArrayRead() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/arrayRead.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/arrayRead.kt"); doTest(fileName); } @TestMetadata("as.kt") public void testAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/as.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/as.kt"); doTest(fileName); } @TestMetadata("asSafe.kt") public void testAsSafe() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/asSafe.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/asSafe.kt"); doTest(fileName); } @TestMetadata("assign.kt") public void testAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/assign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/assign.kt"); doTest(fileName); } @TestMetadata("call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/call.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/doWhile.kt"); doTest(fileName); } @TestMetadata("dotQualified.kt") public void testDotQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/dotQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/dotQualified.kt"); doTest(fileName); } @TestMetadata("elvis.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/elvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/elvis.kt"); doTest(fileName); } @TestMetadata("eqEq.kt") public void testEqEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/eqEq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/eqEq.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/for.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/if.kt"); doTest(fileName); } @TestMetadata("in.kt") public void testIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/in.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/in.kt"); doTest(fileName); } @TestMetadata("infix.kt") public void testInfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/infix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/infix.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/is.kt"); doTest(fileName); } @TestMetadata("labeled.kt") public void testLabeled() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/labeled.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/labeled.kt"); doTest(fileName); } @TestMetadata("less.kt") public void testLess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/less.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/less.kt"); doTest(fileName); } @TestMetadata("mul.kt") public void testMul() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/mul.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/mul.kt"); doTest(fileName); } @TestMetadata("orOr.kt") public void testOrOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/orOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/orOr.kt"); doTest(fileName); } @TestMetadata("parenthesized.kt") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/parenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/parenthesized.kt"); doTest(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/plus.kt"); doTest(fileName); } @TestMetadata("postfix.kt") public void testPostfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfix.kt"); doTest(fileName); } @TestMetadata("postfixPlusPlus.kt") public void testPostfixPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/postfixPlusPlus.kt"); doTest(fileName); } @TestMetadata("prefixPlusPlus.kt") public void testPrefixPlusPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/prefixPlusPlus.kt"); doTest(fileName); } @TestMetadata("range.kt") public void testRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/range.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/range.kt"); doTest(fileName); } @TestMetadata("return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/return.kt"); doTest(fileName); } @TestMetadata("safeQualified.kt") public void testSafeQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/safeQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/safeQualified.kt"); doTest(fileName); } @TestMetadata("simpleName.kt") public void testSimpleName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/simpleName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/simpleName.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/stringTemplate.kt"); doTest(fileName); } @TestMetadata("throw.kt") public void testThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/throw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/throw.kt"); doTest(fileName); } @TestMetadata("try.kt") public void testTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/try.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/try.kt"); doTest(fileName); } @TestMetadata("whenExpressionEntry.kt") public void testWhenExpressionEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenExpressionEntry.kt"); doTest(fileName); } @TestMetadata("whenInEntry.kt") public void testWhenInEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenInEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenInEntry.kt"); doTest(fileName); } @TestMetadata("whenIsEntry.kt") public void testWhenIsEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenIsEntry.kt"); doTest(fileName); } @TestMetadata("whenSubject.kt") public void testWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/whenSubject.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/while.kt"); doTest(fileName); } @@ -5989,72 +5989,72 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unavailable extends AbstractQuickFixTest { public void testAllFilesPresentInUnavailable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inAnnotationArgument.kt") public void testInAnnotationArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inAnnotationArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inAnnotationArgument.kt"); doTest(fileName); } @TestMetadata("inClassHeader.kt") public void testInClassHeader() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inClassHeader.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inClassHeader.kt"); doTest(fileName); } @TestMetadata("inDefaultArgument.kt") public void testInDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inDefaultArgument.kt"); doTest(fileName); } @TestMetadata("inExpressionBody.kt") public void testInExpressionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inExpressionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inExpressionBody.kt"); doTest(fileName); } @TestMetadata("inLocalValInitializer.kt") public void testInLocalValInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inLocalValInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inLocalValInitializer.kt"); doTest(fileName); } @TestMetadata("inParameterType.kt") public void testInParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterType.kt"); doTest(fileName); } @TestMetadata("inParameterTypeInFunctionLiteral.kt") public void testInParameterTypeInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterTypeInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inParameterTypeInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("inPropertyInitializer.kt") public void testInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/inPropertyInitializer.kt"); doTest(fileName); } @TestMetadata("objectLiteral.kt") public void testObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteral.kt"); doTest(fileName); } @TestMetadata("objectLiteralInsideExpression.kt") public void testObjectLiteralInsideExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteralInsideExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/objectLiteralInsideExpression.kt"); doTest(fileName); } @TestMetadata("supretype.kt") public void testSupretype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/supretype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/supretype.kt"); doTest(fileName); } } @@ -6066,84 +6066,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeAddition extends AbstractQuickFixTest { public void testAllFilesPresentInTypeAddition() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("ambiguousFunctionReturnType.kt") public void testAmbiguousFunctionReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousFunctionReturnType.kt"); doTest(fileName); } @TestMetadata("ambiguousPropertyReturnType.kt") public void testAmbiguousPropertyReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/ambiguousPropertyReturnType.kt"); doTest(fileName); } @TestMetadata("changeAccessorTypeToFunctionType.kt") public void testChangeAccessorTypeToFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/changeAccessorTypeToFunctionType.kt"); doTest(fileName); } @TestMetadata("noAddErrorType.kt") public void testNoAddErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/noAddErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/noAddErrorType.kt"); doTest(fileName); } @TestMetadata("protectedFunWithoutReturnType.kt") public void testProtectedFunWithoutReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/protectedFunWithoutReturnType.kt"); doTest(fileName); } @TestMetadata("publicFunWithoutBody.kt") public void testPublicFunWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutBody.kt"); doTest(fileName); } @TestMetadata("publicFunWithoutReturnType.kt") public void testPublicFunWithoutReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnType.kt"); doTest(fileName); } @TestMetadata("publicFunWithoutReturnTypeCaretOnParameter.kt") public void testPublicFunWithoutReturnTypeCaretOnParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicFunWithoutReturnTypeCaretOnParameter.kt"); doTest(fileName); } @TestMetadata("publicValWithoutReturnType.kt") public void testPublicValWithoutReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt"); doTest(fileName); } @TestMetadata("publicValWithoutReturnTypeCaretOnPublic.kt") public void testPublicValWithoutReturnTypeCaretOnPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt"); doTest(fileName); } @TestMetadata("wrongGetterParameterType.kt") public void testWrongGetterParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterType.kt"); doTest(fileName); } @TestMetadata("wrongGetterParameterTypeLongNameRuntime.kt") public void testWrongGetterParameterTypeLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongGetterParameterTypeLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("wrongSetterParameterType.kt") public void testWrongSetterParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/wrongSetterParameterType.kt"); doTest(fileName); } } @@ -6153,36 +6153,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeImports extends AbstractQuickFixTest { public void testAllFilesPresentInTypeImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("hasThisImport.kt") public void testHasThisImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/hasThisImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/hasThisImport.kt"); doTest(fileName); } @TestMetadata("noImportFromTheSameFile.kt") public void testNoImportFromTheSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportFromTheSameFile.kt"); doTest(fileName); } @TestMetadata("noImportJavaLang.kt") public void testNoImportJavaLang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJavaLang.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJavaLang.kt"); doTest(fileName); } @TestMetadata("noImportJetStandard.kt") public void testNoImportJetStandard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJetStandard.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/noImportJetStandard.kt"); doTest(fileName); } @TestMetadata("toImport1.kt") public void testToImport1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/toImport1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/toImport1.kt"); doTest(fileName); } } @@ -6193,209 +6193,209 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { public static class TypeMismatch extends AbstractQuickFixTest { @TestMetadata("accessibleLocalClassInReturn.kt") public void testAccessibleLocalClassInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/accessibleLocalClassInReturn.kt"); doTest(fileName); } @TestMetadata("addExclExclToRemoveNullability.kt") public void testAddExclExclToRemoveNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullability.kt"); doTest(fileName); } @TestMetadata("addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt") public void testAddExclExclToRemoveNullabilityDisabledWhenItCannotHelp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityDisabledWhenItCannotHelp.kt"); doTest(fileName); } @TestMetadata("addExclExclToRemoveNullabilityForGeneric.kt") public void testAddExclExclToRemoveNullabilityForGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityForGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityForGeneric.kt"); doTest(fileName); } @TestMetadata("addExclExclToRemoveNullabilityForSubclass.kt") public void testAddExclExclToRemoveNullabilityForSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityForSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/addExclExclToRemoveNullabilityForSubclass.kt"); doTest(fileName); } public void testAllFilesPresentInTypeMismatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("anonymousObjectInCall.kt") public void testAnonymousObjectInCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInCall.kt"); doTest(fileName); } @TestMetadata("anonymousObjectInInfixCall.kt") public void testAnonymousObjectInInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInfixCall.kt"); doTest(fileName); } @TestMetadata("anonymousObjectInInitializer.kt") public void testAnonymousObjectInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInInitializer.kt"); doTest(fileName); } @TestMetadata("anonymousObjectInReturn.kt") public void testAnonymousObjectInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anonymousObjectInReturn.kt"); doTest(fileName); } @TestMetadata("anyInReturn.kt") public void testAnyInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anyInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/anyInReturn.kt"); doTest(fileName); } @TestMetadata("changeFunctionLiteralParameterTypeToFunctionType.kt") public void testChangeFunctionLiteralParameterTypeToFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt"); doTest(fileName); } @TestMetadata("changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt") public void testChangeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt") public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCall.kt"); doTest(fileName); } @TestMetadata("changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt") public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeFunctionReturnTypeToMatchExpectedTypeOfCallLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("changeReturnTypeToSpecificNullable.kt") public void testChangeReturnTypeToSpecificNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeToSpecificNullable.kt"); doTest(fileName); } @TestMetadata("changeReturnTypeWhenFunctionNameIsMissing.kt") public void testChangeReturnTypeWhenFunctionNameIsMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenFunctionNameIsMissing.kt"); doTest(fileName); } @TestMetadata("changeReturnTypeWhenValueParameterListIsAbsent.kt") public void testChangeReturnTypeWhenValueParameterListIsAbsent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/changeReturnTypeWhenValueParameterListIsAbsent.kt"); doTest(fileName); } @TestMetadata("compareToTypeMismatch.kt") public void testCompareToTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/compareToTypeMismatch.kt"); doTest(fileName); } @TestMetadata("constantTypeMismatch.kt") public void testConstantTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/constantTypeMismatch.kt"); doTest(fileName); } @TestMetadata("dontChangeOverriddenPropertyTypeToErrorType.kt") public void testDontChangeOverriddenPropertyTypeToErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt"); doTest(fileName); } @TestMetadata("expectedParameterTypeMismatch.kt") public void testExpectedParameterTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt"); doTest(fileName); } @TestMetadata("expectedParameterTypeMismatchLongNameRuntime.kt") public void testExpectedParameterTypeMismatchLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("hasNextFunctionReturnTypeMismatch.kt") public void testHasNextFunctionReturnTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/hasNextFunctionReturnTypeMismatch.kt"); doTest(fileName); } @TestMetadata("localClassInReturn1.kt") public void testLocalClassInReturn1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn1.kt"); doTest(fileName); } @TestMetadata("localClassInReturn2.kt") public void testLocalClassInReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/localClassInReturn2.kt"); doTest(fileName); } @TestMetadata("makeReturnTypeNullable.kt") public void testMakeReturnTypeNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/makeReturnTypeNullable.kt"); doTest(fileName); } @TestMetadata("noReturnInFunctionWithBlockBody.kt") public void testNoReturnInFunctionWithBlockBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/noReturnInFunctionWithBlockBody.kt"); doTest(fileName); } @TestMetadata("nullArgumentForNonNullParameter.kt") public void testNullArgumentForNonNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/nullArgumentForNonNullParameter.kt"); doTest(fileName); } @TestMetadata("propertyTypeMismatch.kt") public void testPropertyTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt"); doTest(fileName); } @TestMetadata("propertyTypeMismatchLongNameRuntime.kt") public void testPropertyTypeMismatchLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("resolvableTypeParams.kt") public void testResolvableTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt"); doTest(fileName); } @TestMetadata("returnTypeMismatch.kt") public void testReturnTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/returnTypeMismatch.kt"); doTest(fileName); } @TestMetadata("tooManyArgumentsException.kt") public void testTooManyArgumentsException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/tooManyArgumentsException.kt"); doTest(fileName); } @TestMetadata("unresolvableTypeParams.kt") public void testUnresolvableTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt"); doTest(fileName); } @@ -6404,60 +6404,60 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Casts extends AbstractQuickFixTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("castToFunctionType.kt") public void testCastToFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/castToFunctionType.kt"); doTest(fileName); } @TestMetadata("smartcastImpossible1.kt") public void testSmartcastImpossible1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible1.kt"); doTest(fileName); } @TestMetadata("smartcastImpossible2.kt") public void testSmartcastImpossible2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible2.kt"); doTest(fileName); } @TestMetadata("smartcastImpossible3.kt") public void testSmartcastImpossible3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/smartcastImpossible3.kt"); doTest(fileName); } @TestMetadata("typeMismatch1.kt") public void testTypeMismatch1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch1.kt"); doTest(fileName); } @TestMetadata("typeMismatch2.kt") public void testTypeMismatch2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch2.kt"); doTest(fileName); } @TestMetadata("typeMismatch3.kt") public void testTypeMismatch3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch3.kt"); doTest(fileName); } @TestMetadata("typeMismatch4.kt") public void testTypeMismatch4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatch4.kt"); doTest(fileName); } @TestMetadata("typeMismatchLongNameRuntime.kt") public void testTypeMismatchLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/typeMismatchLongNameRuntime.kt"); doTest(fileName); } } @@ -6467,36 +6467,36 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ComponentFunctionReturnTypeMismatch extends AbstractQuickFixTest { public void testAllFilesPresentInComponentFunctionReturnTypeMismatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("componentFunctionReturnTypeMismatch1.kt") public void testComponentFunctionReturnTypeMismatch1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch1.kt"); doTest(fileName); } @TestMetadata("componentFunctionReturnTypeMismatch2.kt") public void testComponentFunctionReturnTypeMismatch2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch2.kt"); doTest(fileName); } @TestMetadata("componentFunctionReturnTypeMismatch3.kt") public void testComponentFunctionReturnTypeMismatch3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch3.kt"); doTest(fileName); } @TestMetadata("componentFunctionReturnTypeMismatch4.kt") public void testComponentFunctionReturnTypeMismatch4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch4.kt"); doTest(fileName); } @TestMetadata("componentFunctionReturnTypeMismatch5.kt") public void testComponentFunctionReturnTypeMismatch5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/componentFunctionReturnTypeMismatch5.kt"); doTest(fileName); } } @@ -6506,24 +6506,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class FixOverloadedOperator extends AbstractQuickFixTest { public void testAllFilesPresentInFixOverloadedOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeNotFunctionReturnType.kt") public void testChangeNotFunctionReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeNotFunctionReturnType.kt"); doTest(fileName); } @TestMetadata("changePlusFunctionReturnType.kt") public void testChangePlusFunctionReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changePlusFunctionReturnType.kt"); doTest(fileName); } @TestMetadata("changeTimesFunctionParameterType.kt") public void testChangeTimesFunctionParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/changeTimesFunctionParameterType.kt"); doTest(fileName); } } @@ -6533,48 +6533,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ParameterTypeMismatch extends AbstractQuickFixTest { public void testAllFilesPresentInParameterTypeMismatch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("changeFunctionParameterType1.kt") public void testChangeFunctionParameterType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType1.kt"); doTest(fileName); } @TestMetadata("changeFunctionParameterType2.kt") public void testChangeFunctionParameterType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType2.kt"); doTest(fileName); } @TestMetadata("changeFunctionParameterType3.kt") public void testChangeFunctionParameterType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType3.kt"); doTest(fileName); } @TestMetadata("changeFunctionParameterType4.kt") public void testChangeFunctionParameterType4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeFunctionParameterType4.kt"); doTest(fileName); } @TestMetadata("changeParameterTypeLongNameRuntime.kt") public void testChangeParameterTypeLongNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changeParameterTypeLongNameRuntime.kt"); doTest(fileName); } @TestMetadata("changePrimaryConstructorParameterType.kt") public void testChangePrimaryConstructorParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/changePrimaryConstructorParameterType.kt"); doTest(fileName); } @TestMetadata("multiFakeOverride.kt") public void testMultiFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/multiFakeOverride.kt"); doTest(fileName); } } @@ -6584,90 +6584,90 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeMismatchOnReturnedExpression extends AbstractQuickFixTest { public void testAllFilesPresentInTypeMismatchOnReturnedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("assignmentTypeMismatch.kt") public void testAssignmentTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/assignmentTypeMismatch.kt"); doTest(fileName); } @TestMetadata("changeFunctionReturnTypeToFunctionType.kt") public void testChangeFunctionReturnTypeToFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt"); doTest(fileName); } @TestMetadata("changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt") public void testChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt"); doTest(fileName); } @TestMetadata("dontChangeFunctionReturnTypeToErrorType.kt") public void testDontChangeFunctionReturnTypeToErrorType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt"); doTest(fileName); } @TestMetadata("multiFakeOverride.kt") public void testMultiFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverride.kt"); doTest(fileName); } @TestMetadata("multiFakeOverrideForOperatorConvention.kt") public void testMultiFakeOverrideForOperatorConvention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/multiFakeOverrideForOperatorConvention.kt"); doTest(fileName); } @TestMetadata("nonLocalReturnRuntime.kt") public void testNonLocalReturnRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnRuntime.kt"); doTest(fileName); } @TestMetadata("nonLocalReturnWithLabelRuntime.kt") public void testNonLocalReturnWithLabelRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/nonLocalReturnWithLabelRuntime.kt"); doTest(fileName); } @TestMetadata("propertyGetterInitializerTypeMismatch.kt") public void testPropertyGetterInitializerTypeMismatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/propertyGetterInitializerTypeMismatch.kt"); doTest(fileName); } @TestMetadata("returnedExpressionTypeMismatchFunctionParameterType.kt") public void testReturnedExpressionTypeMismatchFunctionParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/returnedExpressionTypeMismatchFunctionParameterType.kt"); doTest(fileName); } @TestMetadata("typeMismatchInIfStatementReturnedByFunction.kt") public void testTypeMismatchInIfStatementReturnedByFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByFunction.kt"); doTest(fileName); } @TestMetadata("typeMismatchInIfStatementReturnedByLiteral.kt") public void testTypeMismatchInIfStatementReturnedByLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt"); doTest(fileName); } @TestMetadata("typeMismatchInInitializer.kt") public void testTypeMismatchInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInInitializer.kt"); doTest(fileName); } @TestMetadata("typeMismatchInReturnStatement.kt") public void testTypeMismatchInReturnStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInReturnStatement.kt"); doTest(fileName); } } @@ -6678,18 +6678,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractQuickFixTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeParameters"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeParameters"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("misplacedClassTypeParameter.kt") public void testMisplacedClassTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeParameters/misplacedClassTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeParameters/misplacedClassTypeParameter.kt"); doTest(fileName); } @TestMetadata("misplacedFunctionTypeParameter.kt") public void testMisplacedFunctionTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeParameters/misplacedFunctionTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeParameters/misplacedFunctionTypeParameter.kt"); doTest(fileName); } } @@ -6699,48 +6699,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeProjection extends AbstractQuickFixTest { public void testAllFilesPresentInTypeProjection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("conflictingProjection.kt") public void testConflictingProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/conflictingProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/conflictingProjection.kt"); doTest(fileName); } @TestMetadata("projectionInImmediateArgumentToSupertype.kt") public void testProjectionInImmediateArgumentToSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionInImmediateArgumentToSupertype.kt"); doTest(fileName); } @TestMetadata("projectionOnNonClassTypeArgument1.kt") public void testProjectionOnNonClassTypeArgument1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt"); doTest(fileName); } @TestMetadata("projectionOnNonClassTypeArgument2.kt") public void testProjectionOnNonClassTypeArgument2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument2.kt"); doTest(fileName); } @TestMetadata("removeRedundantProjection1.kt") public void testRemoveRedundantProjection1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection1.kt"); doTest(fileName); } @TestMetadata("removeRedundantProjection2.kt") public void testRemoveRedundantProjection2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeRedundantProjection2.kt"); doTest(fileName); } @TestMetadata("removeVariance.kt") public void testRemoveVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/removeVariance.kt"); doTest(fileName); } } @@ -6750,18 +6750,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixTest { public void testAllFilesPresentInVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("unusedVariableWithInitializer.kt") public void testUnusedVariableWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithInitializer.kt"); doTest(fileName); } @TestMetadata("unusedVariableWithoutInitializer.kt") public void testUnusedVariableWithoutInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/unusedVariableWithoutInitializer.kt"); doTest(fileName); } @@ -6770,42 +6770,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ChangeMutability extends AbstractQuickFixTest { public void testAllFilesPresentInChangeMutability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("localInGetter.kt") public void testLocalInGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/localInGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/localInGetter.kt"); doTest(fileName); } @TestMetadata("valOverrideVar.kt") public void testValOverrideVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valOverrideVar.kt"); doTest(fileName); } @TestMetadata("valReassignmentLocal.kt") public void testValReassignmentLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentLocal.kt"); doTest(fileName); } @TestMetadata("valReassignmentOuterDecl.kt") public void testValReassignmentOuterDecl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentOuterDecl.kt"); doTest(fileName); } @TestMetadata("valReassignmentProperty.kt") public void testValReassignmentProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valReassignmentProperty.kt"); doTest(fileName); } @TestMetadata("valWithSetter.kt") public void testValWithSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valWithSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/valWithSetter.kt"); doTest(fileName); } } @@ -6815,12 +6815,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class ChangeToFunctionInvocation extends AbstractQuickFixTest { public void testAllFilesPresentInChangeToFunctionInvocation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("funInvWithoutParentheses.kt") public void testFunInvWithoutParentheses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation/funInvWithoutParentheses.kt"); doTest(fileName); } } @@ -6830,24 +6830,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class RemoveValVarFromParameter extends AbstractQuickFixTest { public void testAllFilesPresentInRemoveValVarFromParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/removeValVarFromParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/removeValVarFromParameter"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("catchParameter.kt") public void testCatchParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/catchParameter.kt"); doTest(fileName); } @TestMetadata("constructorParameter.kt") public void testConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt"); doTest(fileName); } @TestMetadata("funParameter.kt") public void testFunParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/funParameter.kt"); doTest(fileName); } @@ -6859,19 +6859,19 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("loopParameter.kt") public void testLoopParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/loopParameter.kt"); doTest(fileName); } @TestMetadata("parameterWithComment.kt") public void testParameterWithComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/parameterWithComment.kt"); doTest(fileName); } @TestMetadata("secondaryConstructorParameter.kt") public void testSecondaryConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/variables/removeValVarFromParameter/secondaryConstructorParameter.kt"); doTest(fileName); } } @@ -6882,48 +6882,48 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractQuickFixTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("breakInWhen.kt") public void testBreakInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/breakInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/breakInWhen.kt"); doTest(fileName); } @TestMetadata("continueInWhen.kt") public void testContinueInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/continueInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/continueInWhen.kt"); doTest(fileName); } @TestMetadata("continueInWhenWithLabel.kt") public void testContinueInWhenWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/continueInWhenWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/continueInWhenWithLabel.kt"); doTest(fileName); } @TestMetadata("elseNotLastInWhen.kt") public void testElseNotLastInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/elseNotLastInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/elseNotLastInWhen.kt"); doTest(fileName); } @TestMetadata("noElseInWhenWithBranches.kt") public void testNoElseInWhenWithBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithBranches.kt"); doTest(fileName); } @TestMetadata("noElseInWhenWithoutBranches.kt") public void testNoElseInWhenWithoutBranches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/noElseInWhenWithoutBranches.kt"); doTest(fileName); } @TestMetadata("twoElseBranchesInWhen.kt") public void testTwoElseBranchesInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/twoElseBranchesInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/when/twoElseBranchesInWhen.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt index 9badc5afef8..990ec470b9d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt @@ -26,16 +26,16 @@ import com.intellij.refactoring.classMembers.MemberInfoBase import com.intellij.refactoring.util.CommonRefactoringUtil import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.util.findElementsByCommentPrefix import java.io.File -public abstract class AbstractMemberPullPushTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractMemberPullPushTest : KotlinLightCodeInsightFixtureTestCase() { private data class ElementInfo(val checked: Boolean, val toAbstract: Boolean) companion object { @@ -43,7 +43,7 @@ public abstract class AbstractMemberPullPushTest : JetLightCodeInsightFixtureTes by NotNullableUserDataProperty(Key.create("ELEMENT_INFO"), ElementInfo(false, false)) } - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE val fixture: JavaCodeInsightTestFixture get() = myFixture @@ -54,7 +54,7 @@ public abstract class AbstractMemberPullPushTest : JetLightCodeInsightFixtureTes val afterFile = File("$path.after") val conflictFile = File("$path.messages") - fixture.testDataPath = "${JetTestUtils.getHomeDirectory()}/${mainFile.getParent()}" + fixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.getParent()}" val mainFileName = mainFile.getName() val mainFileBaseName = FileUtil.getNameWithoutExtension(mainFileName) @@ -79,9 +79,9 @@ public abstract class AbstractMemberPullPushTest : JetLightCodeInsightFixtureTes action(file) assert(!conflictFile.exists()) { "Conflict file $conflictFile should not exist" } - JetTestUtils.assertEqualsToFile(afterFile, file.text!!) + KotlinTestUtils.assertEqualsToFile(afterFile, file.text!!) for ((extraPsiFile, extraFile) in extraFilesToPsi) { - JetTestUtils.assertEqualsToFile(File("${extraFile.getPath()}.after"), extraPsiFile.text) + KotlinTestUtils.assertEqualsToFile(File("${extraFile.getPath()}.after"), extraPsiFile.text) } } catch(e: Exception) { @@ -90,7 +90,7 @@ public abstract class AbstractMemberPullPushTest : JetLightCodeInsightFixtureTes is CommonRefactoringUtil.RefactoringErrorHintException -> e.getMessage()!! else -> throw e } - JetTestUtils.assertEqualsToFile(conflictFile, message) + KotlinTestUtils.assertEqualsToFile(conflictFile, message) } finally { if (addKotlinRuntime) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index 10448a1582c..cc8c098b5c7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.*; @@ -1600,7 +1600,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { checkResultByFile(afterFilePath); } catch (ComparisonFailure e) { - JetTestUtils.assertEqualsToFile(new File(afterFilePath), getEditor()); + KotlinTestUtils.assertEqualsToFile(new File(afterFilePath), getEditor()); } if (checkErrorsAfter && currentFile instanceof KtFile) { DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) currentFile); diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java index 19e9366368b..544c9090d9e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java @@ -23,8 +23,8 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; @@ -34,7 +34,7 @@ import java.util.List; import static com.intellij.codeInsight.TargetElementUtilBase.ELEMENT_NAME_ACCEPTED; import static com.intellij.codeInsight.TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED; -public abstract class AbstractInlineTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractInlineTest extends KotlinLightCodeInsightFixtureTestCase { protected void doTest(@NotNull String path) throws IOException { File afterFile = new File(path + ".after"); @@ -73,6 +73,6 @@ public abstract class AbstractInlineTest extends JetLightCodeInsightFixtureTestC @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java index 240445a15ab..9cb193e3d05 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.inline; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,96 +32,96 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineTestGenerated extends AbstractInlineTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/Basic.kt"); doTest(fileName); } @TestMetadata("BasicCaretOnDeclaration.kt") public void testBasicCaretOnDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt"); doTest(fileName); } @TestMetadata("ifInQualifiedExpression.kt") public void testIfInQualifiedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/ifInQualifiedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/ifInQualifiedExpression.kt"); doTest(fileName); } @TestMetadata("InFunctionLiteral.kt") public void testInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/InFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/InFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("MethodReference.kt") public void testMethodReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MethodReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MethodReference.kt"); doTest(fileName); } @TestMetadata("MultipleInitializers.kt") public void testMultipleInitializers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleInitializers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleInitializers.kt"); doTest(fileName); } @TestMetadata("MultipleUsages.kt") public void testMultipleUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleUsages.kt"); doTest(fileName); } @TestMetadata("Parameter.kt") public void testParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/Parameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/Parameter.kt"); doTest(fileName); } @TestMetadata("SeparateInitializer.kt") public void testSeparateInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializer.kt"); doTest(fileName); } @TestMetadata("SeparateInitializerInTry.kt") public void testSeparateInitializerInTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializerInTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializerInTry.kt"); doTest(fileName); } @TestMetadata("UsedInAssignment.kt") public void testUsedInAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/UsedInAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/UsedInAssignment.kt"); doTest(fileName); } @TestMetadata("ValWithoutInitializer.kt") public void testValWithoutInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/ValWithoutInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/ValWithoutInitializer.kt"); doTest(fileName); } @TestMetadata("varNoWrite.kt") public void testVarNoWrite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/varNoWrite.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varNoWrite.kt"); doTest(fileName); } @TestMetadata("varWithAssignment.kt") public void testVarWithAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithAssignment.kt"); doTest(fileName); } @TestMetadata("varWithInc.kt") public void testVarWithInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/varWithInc.kt"); doTest(fileName); } @@ -130,186 +130,186 @@ public class InlineTestGenerated extends AbstractInlineTest { @RunWith(JUnit3RunnerWithInners.class) public static class AddParenthesis extends AbstractInlineTest { public void testAllFilesPresentInAddParenthesis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt"); doTest(fileName); } @TestMetadata("ArrayAccessDontAdd.kt") public void testArrayAccessDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt"); doTest(fileName); } @TestMetadata("Binary.kt") public void testBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Binary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Binary.kt"); doTest(fileName); } @TestMetadata("BinaryDontAdd.kt") public void testBinaryDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt"); doTest(fileName); } @TestMetadata("Call.kt") public void testCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Call.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Call.kt"); doTest(fileName); } @TestMetadata("CallDontAdd.kt") public void testCallDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt"); doTest(fileName); } @TestMetadata("Callee.kt") public void testCallee() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Callee.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Callee.kt"); doTest(fileName); } @TestMetadata("ColonDontAdd.kt") public void testColonDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt"); doTest(fileName); } @TestMetadata("If.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/If.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/If.kt"); doTest(fileName); } @TestMetadata("IfIntoArrayAccess.kt") public void testIfIntoArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt"); doTest(fileName); } @TestMetadata("IfIntoArrayAccessBrackets.kt") public void testIfIntoArrayAccessBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt"); doTest(fileName); } @TestMetadata("IfIntoBinaryLeft.kt") public void testIfIntoBinaryLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt"); doTest(fileName); } @TestMetadata("IfIntoBinaryRight.kt") public void testIfIntoBinaryRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt"); doTest(fileName); } @TestMetadata("IfIntoBinaryRightLeft.kt") public void testIfIntoBinaryRightLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt"); doTest(fileName); } @TestMetadata("IfIntoBinaryRightLeftDontAdd.kt") public void testIfIntoBinaryRightLeftDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt"); doTest(fileName); } @TestMetadata("IfIntoPostfix.kt") public void testIfIntoPostfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt"); doTest(fileName); } @TestMetadata("IfIntoPrefix.kt") public void testIfIntoPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt"); doTest(fileName); } @TestMetadata("IsDontAdd.kt") public void testIsDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt"); doTest(fileName); } @TestMetadata("IsIntoCall.kt") public void testIsIntoCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt"); doTest(fileName); } @TestMetadata("LeftAssociative.kt") public void testLeftAssociative() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt"); doTest(fileName); } @TestMetadata("LeftAssociativeBoolean.kt") public void testLeftAssociativeBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt"); doTest(fileName); } @TestMetadata("LeftAssociativeDontAdd.kt") public void testLeftAssociativeDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt"); doTest(fileName); } @TestMetadata("PostfixIntoPrefix.kt") public void testPostfixIntoPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt"); doTest(fileName); } @TestMetadata("PrefixIntoPostfix.kt") public void testPrefixIntoPostfix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt"); doTest(fileName); } @TestMetadata("Qualified.kt") public void testQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Qualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Qualified.kt"); doTest(fileName); } @TestMetadata("QualifiedDontAdd.kt") public void testQualifiedDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt"); doTest(fileName); } @TestMetadata("StringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt"); doTest(fileName); } @TestMetadata("StringTemplateAlreadyInBraces.kt") public void testStringTemplateAlreadyInBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt"); doTest(fileName); } @TestMetadata("StringTemplateDontAdd.kt") public void testStringTemplateDontAdd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt"); doTest(fileName); } @TestMetadata("UnaryIntoBinary.kt") public void testUnaryIntoBinary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt"); doTest(fileName); } } @@ -319,48 +319,48 @@ public class InlineTestGenerated extends AbstractInlineTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExplicateParameterTypes extends AbstractInlineTest { public void testAllFilesPresentInExplicateParameterTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("EnoughDontExplicate.kt") public void testEnoughDontExplicate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt"); doTest(fileName); } @TestMetadata("ErrorTypes.kt") public void testErrorTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt"); doTest(fileName); } @TestMetadata("It.kt") public void testIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/It.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/It.kt"); doTest(fileName); } @TestMetadata("ItMultiLine.kt") public void testItMultiLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt"); doTest(fileName); } @TestMetadata("Parenthesized.kt") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt"); doTest(fileName); } @TestMetadata("Simplest.kt") public void testSimplest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt"); doTest(fileName); } @TestMetadata("TrivialDontExplicate.kt") public void testTrivialDontExplicate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt"); doTest(fileName); } } @@ -370,60 +370,60 @@ public class InlineTestGenerated extends AbstractInlineTest { @RunWith(JUnit3RunnerWithInners.class) public static class ExplicateTypeArgument extends AbstractInlineTest { public void testAllFilesPresentInExplicateTypeArgument() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DeeperNestedCall.kt") public void testDeeperNestedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt"); doTest(fileName); } @TestMetadata("EnoughDontExplicate.kt") public void testEnoughDontExplicate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt"); doTest(fileName); } @TestMetadata("ExplicateForSome.kt") public void testExplicateForSome() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt"); doTest(fileName); } @TestMetadata("InStringTemplate.kt") public void testInStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt"); doTest(fileName); } @TestMetadata("NestedCall.kt") public void testNestedCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt"); doTest(fileName); } @TestMetadata("Parenthesized.kt") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt"); doTest(fileName); } @TestMetadata("Qualified.kt") public void testQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt"); doTest(fileName); } @TestMetadata("Simplest.kt") public void testSimplest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt"); doTest(fileName); } @TestMetadata("TrivialDontExplicate.kt") public void testTrivialDontExplicate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt"); doTest(fileName); } } @@ -433,54 +433,54 @@ public class InlineTestGenerated extends AbstractInlineTest { @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractInlineTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Basic.kt") public void testBasic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/Basic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/Basic.kt"); doTest(fileName); } @TestMetadata("ClassObjectProperty.kt") public void testClassObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ClassObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ClassObjectProperty.kt"); doTest(fileName); } @TestMetadata("ExtensionProperty.kt") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ExtensionProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ExtensionProperty.kt"); doTest(fileName); } @TestMetadata("InstanceProperty.kt") public void testInstanceProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/InstanceProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/InstanceProperty.kt"); doTest(fileName); } @TestMetadata("ObjectProperty.kt") public void testObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ObjectProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ObjectProperty.kt"); doTest(fileName); } @TestMetadata("QualifiedUsage.kt") public void testQualifiedUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/QualifiedUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/QualifiedUsage.kt"); doTest(fileName); } @TestMetadata("WithGetter.kt") public void testWithGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithGetter.kt"); doTest(fileName); } @TestMetadata("WithInitializerAndGetter.kt") public void testWithInitializerAndGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index d88a476ef4a..ced43ad7ec0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.introduceProperty.INTRODU import org.jetbrains.kotlin.idea.refactoring.introduce.introduceProperty.KotlinIntroducePropertyHandler import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.KtFile @@ -58,7 +58,7 @@ import java.io.File import java.util.* import kotlin.test.assertEquals -public abstract class AbstractExtractionTest() : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST val fixture: JavaCodeInsightTestFixture get() = myFixture diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java index 9b3424c278c..fa4f68a6492 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.introduce; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,408 +28,408 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetExtractionTestGenerated extends AbstractJetExtractionTest { +public class ExtractionTestGenerated extends AbstractExtractionTest { @TestMetadata("idea/testData/refactoring/introduceVariable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IntroduceVariable extends AbstractJetExtractionTest { + public static class IntroduceVariable extends AbstractExtractionTest { public void testAllFilesPresentInIntroduceVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceVariable"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceVariable"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayAccessExpr.kt") public void testArrayAccessExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ArrayAccessExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ArrayAccessExpr.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("callUnderSmartCast.kt") public void testCallUnderSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/callUnderSmartCast.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("CantIntroduceToClass.kt") public void testCantIntroduceToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/CantIntroduceToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/CantIntroduceToClass.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("CantIntroduceToFile.kt") public void testCantIntroduceToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/CantIntroduceToFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/CantIntroduceToFile.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ComplexCallee.kt") public void testComplexCallee() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ComplexCallee.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ComplexCallee.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ConstructorDelegationCall.kt") public void testConstructorDelegationCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ConstructorDelegationCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ConstructorDelegationCall.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DelegatorByExpressionInDelegate.kt") public void testDelegatorByExpressionInDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorByExpressionInDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorByExpressionInDelegate.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DelegatorByExpressionInType.kt") public void testDelegatorByExpressionInType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorByExpressionInType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorByExpressionInType.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DelegatorToSuperCallInArgument.kt") public void testDelegatorToSuperCallInArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperCallInArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperCallInArgument.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DelegatorToSuperCallInType.kt") public void testDelegatorToSuperCallInType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperCallInType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperCallInType.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DelegatorToSuperClass.kt") public void testDelegatorToSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DelegatorToSuperClass.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DoWhileAddBlock.kt") public void testDoWhileAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("DoWhileAddBlockInner.kt") public void testDoWhileAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("dynamicType.kt") public void testDynamicType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/dynamicType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/dynamicType.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FewOccurrences.kt") public void testFewOccurrences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FewOccurrences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FewOccurrences.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FunctionAddBlock.kt") public void testFunctionAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FunctionAddBlockInner.kt") public void testFunctionAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FunctionLiteral.kt") public void testFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteral.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FunctionLiteralFromExpected.kt") public void testFunctionLiteralFromExpected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteralFromExpected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteralFromExpected.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("FunctionLiteralWithExtraArgs.kt") public void testFunctionLiteralWithExtraArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteralWithExtraArgs.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfCondition.kt") public void testIfCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfCondition.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfElseAddBlock.kt") public void testIfElseAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfElseAddBlockInner.kt") public void testIfElseAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfThenAddBlock.kt") public void testIfThenAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfThenAddBlockInner.kt") public void testIfThenAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IfThenValuedAddBlock.kt") public void testIfThenValuedAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenValuedAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenValuedAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("InsideOfInitializerAnnotation.kt") public void testInsideOfInitializerAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/InsideOfInitializerAnnotation.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IntroduceAndCreateBlock.kt") public void testIntroduceAndCreateBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IntroduceAndCreateBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IntroduceAndCreateBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("IntroduceLambdaAndCreateBlock.kt") public void testIntroduceLambdaAndCreateBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IntroduceLambdaAndCreateBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IntroduceLambdaAndCreateBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("It.kt") public void testIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/It.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/It.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("LoopRange.kt") public void testLoopRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/LoopRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/LoopRange.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ManyInnerOccurences.kt") public void testManyInnerOccurences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyInnerOccurences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyInnerOccurences.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ManyOccurrences.kt") public void testManyOccurrences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyOccurrences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyOccurrences.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NameSuggestionBug1.kt") public void testNameSuggestionBug1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionBug1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionBug1.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NameSuggestionBug2.kt") public void testNameSuggestionBug2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionBug2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionBug2.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NameSuggestionCheckVisibility.kt") public void testNameSuggestionCheckVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionCheckVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NameSuggestionCheckVisibility.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("noConflictWithInnerVariable.kt") public void testNoConflictWithInnerVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/noConflictWithInnerVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/noConflictWithInnerVariable.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NoExplicitReceivers.kt") public void testNoExplicitReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NoExplicitReceiversUnresolved.kt") public void testNoExplicitReceiversUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceiversUnresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceiversUnresolved.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NoNewLinesInBetween.kt") public void testNoNewLinesInBetween() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoNewLinesInBetween.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("NoNewLinesInBetweenNoBraces.kt") public void testNoNewLinesInBetweenNoBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoNewLinesInBetweenNoBraces.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("nonEquivalentReceivers.kt") public void testNonEquivalentReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("notNullAssertion.kt") public void testNotNullAssertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/notNullAssertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/notNullAssertion.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("OccurrencesInStringTemplate.kt") public void testOccurrencesInStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/OccurrencesInStringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/OccurrencesInStringTemplate.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("OneExplicitReceiver.kt") public void testOneExplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("PropertyAccessorAddBlock.kt") public void testPropertyAccessorAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("PropertyAccessorAddBlockInner.kt") public void testPropertyAccessorAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/PropertyAccessorAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ReplaceOccurence.kt") public void testReplaceOccurence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ReplaceOccurence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ReplaceOccurence.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/Simple.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("SimpleCreateValue.kt") public void testSimpleCreateValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/SimpleCreateValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/SimpleCreateValue.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("StringInjection.kt") public void testStringInjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/StringInjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/StringInjection.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("SuperReference.kt") public void testSuperReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/SuperReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/SuperReference.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("ThisReference.kt") public void testThisReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ThisReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ThisReference.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("TwoExplicitReceivers.kt") public void testTwoExplicitReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("TypeElement.kt") public void testTypeElement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/TypeElement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/TypeElement.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("UnresolvedOccurrences.kt") public void testUnresolvedOccurrences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UnresolvedOccurrences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UnresolvedOccurrences.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("UsedAndUnusedExpressions1.kt") public void testUsedAndUnusedExpressions1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions1.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("UsedAndUnusedExpressions2.kt") public void testUsedAndUnusedExpressions2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/UsedAndUnusedExpressions2.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhenAddBlock.kt") public void testWhenAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhenAddBlockInner.kt") public void testWhenAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhenEntryCondition.kt") public void testWhenEntryCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenEntryCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenEntryCondition.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhenParts.kt") public void testWhenParts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenParts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenParts.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhenValuedAddBlock.kt") public void testWhenValuedAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenValuedAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenValuedAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhileAddBlock.kt") public void testWhileAddBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlock.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhileAddBlockInner.kt") public void testWhileAddBlockInner() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlockInner.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlockInner.kt"); doIntroduceVariableTest(fileName); } @TestMetadata("WhileCondition.kt") public void testWhileCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileCondition.kt"); doIntroduceVariableTest(fileName); } } @@ -437,274 +437,274 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ExtractFunction extends AbstractJetExtractionTest { + public static class ExtractFunction extends AbstractExtractionTest { public void testAllFilesPresentInExtractFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/refactoring/extractFunction/basic") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Basic extends AbstractJetExtractionTest { + public static class Basic extends AbstractExtractionTest { public void testAllFilesPresentInBasic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callWithPlatformTypeReceiver.kt") public void testCallWithPlatformTypeReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt"); doExtractFunctionTest(fileName); } @TestMetadata("calleeExpression.kt") public void testCalleeExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/calleeExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/calleeExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("classQualifier.kt") public void testClassQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/classQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/classQualifier.kt"); doExtractFunctionTest(fileName); } @TestMetadata("convertBinaryExpression.kt") public void testConvertBinaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertBinaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertBinaryExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("convertInfixExpression.kt") public void testConvertInfixExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertInfixExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("convertUnaryExpression.kt") public void testConvertUnaryExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("delegatingFunction.kt") public void testDelegatingFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("enumQualifier.kt") public void testEnumQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/enumQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/enumQualifier.kt"); doExtractFunctionTest(fileName); } @TestMetadata("extensionFunForArray.kt") public void testExtensionFunForArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt"); doExtractFunctionTest(fileName); } @TestMetadata("extractBlockContent.kt") public void testExtractBlockContent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractBlockContent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractBlockContent.kt"); doExtractFunctionTest(fileName); } @TestMetadata("extractToEnumClassBody.kt") public void testExtractToEnumClassBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/extractToEnumClassBody.kt"); doExtractFunctionTest(fileName); } @TestMetadata("fakeOverride.kt") public void testFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fakeOverride.kt"); doExtractFunctionTest(fileName); } @TestMetadata("fragmentWithComment.kt") public void testFragmentWithComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt"); doExtractFunctionTest(fileName); } @TestMetadata("fragmentWithMultilineComment.kt") public void testFragmentWithMultilineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt"); doExtractFunctionTest(fileName); } @TestMetadata("identityEquals.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/identityEquals.kt"); doExtractFunctionTest(fileName); } @TestMetadata("invisibleType.kt") public void testInvisibleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/invisibleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/invisibleType.kt"); doExtractFunctionTest(fileName); } @TestMetadata("lineWithSemicolon.kt") public void testLineWithSemicolon() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/lineWithSemicolon.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/lineWithSemicolon.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassExtraction.kt") public void testLocalClassExtraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassFunctionRef.kt") public void testLocalClassFunctionRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassFunctionRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassFunctionRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassPropertyRef.kt") public void testLocalClassPropertyRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassPropertyRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassPropertyRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localExtraction.kt") public void testLocalExtraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localExtraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localExtraction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunExtraction.kt") public void testLocalFunExtraction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunExtraction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunExtraction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionInTheMiddleSimpleControlFlow.kt") public void testLocalFunctionInTheMiddleSimpleControlFlow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleSimpleControlFlow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleSimpleControlFlow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionInTheMiddleUnusedVar.kt") public void testLocalFunctionInTheMiddleUnusedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleUnusedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleUnusedVar.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionInTheMiddleUsedVar.kt") public void testLocalFunctionInTheMiddleUsedVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleUsedVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionInTheMiddleUsedVar.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionRef.kt") public void testLocalFunctionRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localObjectRef.kt") public void testLocalObjectRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localObjectRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localObjectRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("malformedExpression.kt") public void testMalformedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("malformedStatements.kt") public void testMalformedStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedStatements.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberValUnderSmartCast.kt") public void testMemberValUnderSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCast.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberValUnderSmartCastAndImplicitReceiver.kt") public void testMemberValUnderSmartCastAndImplicitReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/memberValUnderSmartCastAndImplicitReceiver.kt"); doExtractFunctionTest(fileName); } @TestMetadata("misdirectedRef.kt") public void testMisdirectedRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("noConflictWithInnerFunction.kt") public void testNoConflictWithInnerFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("objectQualifier.kt") public void testObjectQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/objectQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/objectQualifier.kt"); doExtractFunctionTest(fileName); } @TestMetadata("packageQualifier.kt") public void testPackageQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/packageQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/packageQualifier.kt"); doExtractFunctionTest(fileName); } @TestMetadata("privateMemberInClassObject.kt") public void testPrivateMemberInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("privateMemberRef.kt") public void testPrivateMemberRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("privateNestedClass.kt") public void testPrivateNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateNestedClass.kt"); doExtractFunctionTest(fileName); } @TestMetadata("privateSetter.kt") public void testPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateSetter.kt"); doExtractFunctionTest(fileName); } @TestMetadata("refInReturn.kt") public void testRefInReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/refInReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/refInReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelValUnderSmartCast.kt") public void testTopLevelValUnderSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt"); doExtractFunctionTest(fileName); } @TestMetadata("traitFunction.kt") public void testTraitFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/traitFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/traitFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("unresolvedWrongReceiver.kt") public void testUnresolvedWrongReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/unresolvedWrongReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/unresolvedWrongReceiver.kt"); doExtractFunctionTest(fileName); } } @@ -712,76 +712,76 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ControlFlow extends AbstractJetExtractionTest { + public static class ControlFlow extends AbstractExtractionTest { public void testAllFilesPresentInControlFlow() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ConditionalJumps extends AbstractJetExtractionTest { + public static class ConditionalJumps extends AbstractExtractionTest { public void testAllFilesPresentInConditionalJumps() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("conditionalBreakWithIf.kt") public void testConditionalBreakWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalBreakWithIfAndExtraVars.kt") public void testConditionalBreakWithIfAndExtraVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalBreakWithIfElse.kt") public void testConditionalBreakWithIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalBreakWithWhen.kt") public void testConditionalBreakWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalReturnWithIf.kt") public void testConditionalReturnWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalReturnWithIfElse.kt") public void testConditionalReturnWithIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("conditionalReturnWithWhen.kt") public void testConditionalReturnWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("unconditionalBreakWithIf.kt") public void testUnconditionalBreakWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("unconditionalBreakWithIfElse.kt") public void testUnconditionalBreakWithIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("unconditionalBreakWithWhen.kt") public void testUnconditionalBreakWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt"); doExtractFunctionTest(fileName); } } @@ -789,50 +789,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/default") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Default extends AbstractJetExtractionTest { + public static class Default extends AbstractExtractionTest { public void testAllFilesPresentInDefault() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/default"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/default"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultCF.kt") public void testDefaultCF() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultCFWithExtraVars.kt") public void testDefaultCFWithExtraVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultCFWithJumps.kt") public void testDefaultCFWithJumps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt"); doExtractFunctionTest(fileName); } @TestMetadata("ignoredReturnValueWithIf.kt") public void testIgnoredReturnValueWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("ignoredReturnValueWithIfNoBlocks.kt") public void testIgnoredReturnValueWithIfNoBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt"); doExtractFunctionTest(fileName); } @TestMetadata("ignoredReturnValueWithWhen.kt") public void testIgnoredReturnValueWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("ignoredReturnValueWithWhenNoBlocks.kt") public void testIgnoredReturnValueWithWhenNoBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt"); doExtractFunctionTest(fileName); } } @@ -840,56 +840,56 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefiniteReturns extends AbstractJetExtractionTest { + public static class DefiniteReturns extends AbstractExtractionTest { public void testAllFilesPresentInDefiniteReturns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("definiteReturnWithIf.kt") public void testDefiniteReturnWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("definiteReturnWithWhen.kt") public void testDefiniteReturnWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("labeledAndUnlabeledReturn1.kt") public void testLabeledAndUnlabeledReturn1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("labeledAndUnlabeledReturn2.kt") public void testLabeledAndUnlabeledReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nonLocalReturn.kt") public void testNonLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nonLocalReturnWithLabel.kt") public void testNonLocalReturnWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt"); doExtractFunctionTest(fileName); } @TestMetadata("returnWithLabel.kt") public void testReturnWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/returnWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/returnWithLabel.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleDefiniteReturn.kt") public void testSingleDefiniteReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt"); doExtractFunctionTest(fileName); } } @@ -897,92 +897,92 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class EvaluateExpression extends AbstractJetExtractionTest { + public static class EvaluateExpression extends AbstractExtractionTest { public void testAllFilesPresentInEvaluateExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("evalExprInIfCondition.kt") public void testEvalExprInIfCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExprInIfElse.kt") public void testEvalExprInIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExprInIfThen.kt") public void testEvalExprInIfThen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExprInWhenBranch.kt") public void testEvalExprInWhenBranch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExprInWhenCondition.kt") public void testEvalExprInWhenCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExprInWhenSubject.kt") public void testEvalExprInWhenSubject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExpressionBodyFunction.kt") public void testEvalExpressionBodyFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalIfExpr.kt") public void testEvalIfExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalWhenExpr.kt") public void testEvalWhenExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt"); doExtractFunctionTest(fileName); } @TestMetadata("simpleEvalExpr.kt") public void testSimpleEvalExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt"); doExtractFunctionTest(fileName); } @TestMetadata("trailingLambdaEmptyArgList.kt") public void testTrailingLambdaEmptyArgList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt"); doExtractFunctionTest(fileName); } @TestMetadata("trailingLambdaNoArgList.kt") public void testTrailingLambdaNoArgList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt"); doExtractFunctionTest(fileName); } @TestMetadata("trailingLambdaNonEmptyArgList.kt") public void testTrailingLambdaNonEmptyArgList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt"); doExtractFunctionTest(fileName); } @TestMetadata("trailingLambdaNonEmptyArgListWithNamedArgs.kt") public void testTrailingLambdaNonEmptyArgListWithNamedArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt"); doExtractFunctionTest(fileName); } } @@ -990,56 +990,56 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ExitPointEquivalence extends AbstractJetExtractionTest { + public static class ExitPointEquivalence extends AbstractExtractionTest { public void testAllFilesPresentInExitPointEquivalence() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("breakAndReturn.kt") public void testBreakAndReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakAndReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("breakContinueAndDefault.kt") public void testBreakContinueAndDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/breakContinueAndDefault.kt"); doExtractFunctionTest(fileName); } @TestMetadata("continueAndReturn.kt") public void testContinueAndReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/continueAndReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/continueAndReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultAndBreak.kt") public void testDefaultAndBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndBreak.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultAndContinue.kt") public void testDefaultAndContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndContinue.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultAndReturn.kt") public void testDefaultAndReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultAndReturnInWhen.kt") public void testDefaultAndReturnInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/defaultAndReturnInWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleBreaks.kt") public void testMultipleBreaks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/multipleBreaks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/exitPointEquivalence/multipleBreaks.kt"); doExtractFunctionTest(fileName); } } @@ -1047,50 +1047,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Initializer extends AbstractJetExtractionTest { + public static class Initializer extends AbstractExtractionTest { public void testAllFilesPresentInInitializer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/initializer"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/initializer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("propertyWithInitializer.kt") public void testPropertyWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt"); doExtractFunctionTest(fileName); } @TestMetadata("propertyWithInitializerAndExtraVars.kt") public void testPropertyWithInitializerAndExtraVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt"); doExtractFunctionTest(fileName); } @TestMetadata("propertyWithInitializerAndUnusedVars.kt") public void testPropertyWithInitializerAndUnusedVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt"); doExtractFunctionTest(fileName); } @TestMetadata("propertyWithSeparateInitializer.kt") public void testPropertyWithSeparateInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valueUsedInAnonymousObject.kt") public void testValueUsedInAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valueUsedInLambda.kt") public void testValueUsedInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valueUsedInLocalFunction.kt") public void testValueUsedInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt"); doExtractFunctionTest(fileName); } } @@ -1098,158 +1098,158 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class OutputValues extends AbstractJetExtractionTest { + public static class OutputValues extends AbstractExtractionTest { public void testAllFilesPresentInOutputValues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/outputValues"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/outputValues"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericPair.kt") public void testGenericPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt"); doExtractFunctionTest(fileName); } @TestMetadata("initializersAndUpdate.kt") public void testInitializersAndUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/initializersAndUpdate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/initializersAndUpdate.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nestedNonInlinableCall.kt") public void testNestedNonInlinableCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/nestedNonInlinableCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueWithExpression.kt") public void testOutputValueWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueWithReturn.kt") public void testOutputValueWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueWithSingleLineExpression.kt") public void testOutputValueWithSingleLineExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValueWithSingleLineExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValuesWithExpression.kt") public void testOutputValuesWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/outputValuesWithExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pair.kt") public void testPair() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pair.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pairOfInitalizersWithNonLocalUsages.kt") public void testPairOfInitalizersWithNonLocalUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairOfInitalizersWithNonLocalUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairOfInitalizersWithNonLocalUsages.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pairOfVarInitalizersWithNonLocalUsages.kt") public void testPairOfVarInitalizersWithNonLocalUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairOfVarInitalizersWithNonLocalUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairOfVarInitalizersWithNonLocalUsages.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pairWithIf.kt") public void testPairWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pairWithNameClash.kt") public void testPairWithNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithNameClash.kt"); doExtractFunctionTest(fileName); } @TestMetadata("pairWithWhen.kt") public void testPairWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleOutputValue.kt") public void testSingleOutputValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleOutputValueWithIf.kt") public void testSingleOutputValueWithIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleOutputValueWithIfElse.kt") public void testSingleOutputValueWithIfElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleOutputValueWithWhen.kt") public void testSingleOutputValueWithWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleOutputValueWithWhenElse.kt") public void testSingleOutputValueWithWhenElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt"); doExtractFunctionTest(fileName); } @TestMetadata("tooManyOutputValues.kt") public void testTooManyOutputValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValues.kt"); doExtractFunctionTest(fileName); } @TestMetadata("tooManyOutputValuesAsList.kt") public void testTooManyOutputValuesAsList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/tooManyOutputValuesAsList.kt"); doExtractFunctionTest(fileName); } @TestMetadata("triple.kt") public void testTriple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/triple.kt"); doExtractFunctionTest(fileName); } @TestMetadata("usedAndUnusedOutputValues.kt") public void testUsedAndUnusedOutputValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/usedAndUnusedOutputValues.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valAndVarInitalizersWithNonLocalUsages.kt") public void testValAndVarInitalizersWithNonLocalUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valAndVarInitalizersWithNonLocalUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valAndVarInitalizersWithNonLocalUsages.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valuesUsedInLambdaOnly.kt") public void testValuesUsedInLambdaOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt"); doExtractFunctionTest(fileName); } @TestMetadata("valuesUsedInNestedBlock.kt") public void testValuesUsedInNestedBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt"); doExtractFunctionTest(fileName); } } @@ -1257,26 +1257,26 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ReturnTypeCandidates extends AbstractJetExtractionTest { + public static class ReturnTypeCandidates extends AbstractExtractionTest { public void testAllFilesPresentInReturnTypeCandidates() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaAnnotatedNotNull.kt") public void testJavaAnnotatedNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNotNull.kt"); doExtractFunctionTest(fileName); } @TestMetadata("javaAnnotatedNullable.kt") public void testJavaAnnotatedNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaAnnotatedNullable.kt"); doExtractFunctionTest(fileName); } @TestMetadata("javaNoNullabilityAnnotation.kt") public void testJavaNoNullabilityAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaNoNullabilityAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/returnTypeCandidates/javaNoNullabilityAnnotation.kt"); doExtractFunctionTest(fileName); } } @@ -1284,44 +1284,44 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Throws extends AbstractJetExtractionTest { + public static class Throws extends AbstractExtractionTest { public void testAllFilesPresentInThrows() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/throws"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/throws"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("breakWithThrow.kt") public void testBreakWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("continueWithThrow.kt") public void testContinueWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExpressionWithThrow.kt") public void testEvalExpressionWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nonValuedReturnWithThrow.kt") public void testNonValuedReturnWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueWithThrow.kt") public void testOutputValueWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt"); doExtractFunctionTest(fileName); } @TestMetadata("returnWithThrow.kt") public void testReturnWithThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt"); doExtractFunctionTest(fileName); } } @@ -1329,50 +1329,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Unextractable extends AbstractJetExtractionTest { + public static class Unextractable extends AbstractExtractionTest { public void testAllFilesPresentInUnextractable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/unextractable"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/unextractable"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/anonymousObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("evalExpressionWithReturn.kt") public void testEvalExpressionWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/evalExpressionWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/evalExpressionWithReturn.kt"); doExtractFunctionTest(fileName); } @TestMetadata("jumpsAndReturns.kt") public void testJumpsAndReturns() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/jumpsAndReturns.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/jumpsAndReturns.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleJumps.kt") public void testMultipleJumps() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleJumps.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleJumps.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleReturnsWithDefault.kt") public void testMultipleReturnsWithDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleReturnsWithDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleReturnsWithDefault.kt"); doExtractFunctionTest(fileName); } @TestMetadata("unmatchedReturnTargets.kt") public void testUnmatchedReturnTargets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/unmatchedReturnTargets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/unmatchedReturnTargets.kt"); doExtractFunctionTest(fileName); } @TestMetadata("variablesOutOfScope.kt") public void testVariablesOutOfScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/variablesOutOfScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/variablesOutOfScope.kt"); doExtractFunctionTest(fileName); } } @@ -1381,50 +1381,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/defaultContainer") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class DefaultContainer extends AbstractJetExtractionTest { + public static class DefaultContainer extends AbstractExtractionTest { public void testAllFilesPresentInDefaultContainer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/defaultContainer"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/defaultContainer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("classFunction.kt") public void testClassFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nestedLambda.kt") public void testNestedLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt"); doExtractFunctionTest(fileName); } } @@ -1432,26 +1432,26 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/delegation") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Delegation extends AbstractJetExtractionTest { + public static class Delegation extends AbstractExtractionTest { public void testAllFilesPresentInDelegation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/delegation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/delegation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegationByExpression.kt") public void testDelegationByExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt"); doExtractFunctionTest(fileName); } @TestMetadata("delegationByExpressionFull.kt") public void testDelegationByExpressionFull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt"); doExtractFunctionTest(fileName); } @TestMetadata("delegationBySuperCall.kt") public void testDelegationBySuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt"); doExtractFunctionTest(fileName); } } @@ -1459,74 +1459,74 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/duplicates") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Duplicates extends AbstractJetExtractionTest { + public static class Duplicates extends AbstractExtractionTest { public void testAllFilesPresentInDuplicates() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/duplicates"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/duplicates"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("branchingMatch1.kt") public void testBranchingMatch1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/branchingMatch1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("branchingMatch2.kt") public void testBranchingMatch2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/branchingMatch2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("defaultCF.kt") public void testDefaultCF() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/defaultCF.kt"); doExtractFunctionTest(fileName); } @TestMetadata("insertAfterDuplicates.kt") public void testInsertAfterDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt"); doExtractFunctionTest(fileName); } @TestMetadata("insertBeforeDuplicates.kt") public void testInsertBeforeDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleOutputValuesMatching.kt") public void testMultipleOutputValuesMatching() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/multipleOutputValuesMatching.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nestedStrongMatch.kt") public void testNestedStrongMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt"); doExtractFunctionTest(fileName); } @TestMetadata("notNullAssertion.kt") public void testNotNullAssertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueAndUnitMatching.kt") public void testOutputValueAndUnitMatching() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/outputValueAndUnitMatching.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/outputValueAndUnitMatching.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outputValueMatching.kt") public void testOutputValueMatching() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/outputValueMatching.kt"); doExtractFunctionTest(fileName); } @TestMetadata("singleExpression.kt") public void testSingleExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt"); doExtractFunctionTest(fileName); } } @@ -1534,40 +1534,40 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Initializers extends AbstractJetExtractionTest { + public static class Initializers extends AbstractExtractionTest { public void testAllFilesPresentInInitializers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/refactoring/extractFunction/initializers/accessors") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Accessors extends AbstractJetExtractionTest { + public static class Accessors extends AbstractExtractionTest { public void testAllFilesPresentInAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/accessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/accessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("memberProperty.kt") public void testMemberProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberPropertyWithLambda.kt") public void testMemberPropertyWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelPropertyWithLambda.kt") public void testTopLevelPropertyWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt"); doExtractFunctionTest(fileName); } } @@ -1575,32 +1575,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/classes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Classes extends AbstractJetExtractionTest { + public static class Classes extends AbstractExtractionTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classInitializer.kt") public void testClassInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt"); doExtractFunctionTest(fileName); } @TestMetadata("classInitializerWithLambda.kt") public void testClassInitializerWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("classParameters.kt") public void testClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt"); doExtractFunctionTest(fileName); } @TestMetadata("classParametersWithLambda.kt") public void testClassParametersWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt"); doExtractFunctionTest(fileName); } } @@ -1608,80 +1608,80 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/functions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Functions extends AbstractJetExtractionTest { + public static class Functions extends AbstractExtractionTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/functions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localFunction.kt") public void testLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionParameters.kt") public void testLocalFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParameters.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionParametersWithLambda.kt") public void testLocalFunctionParametersWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParametersWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParametersWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFunctionWithLambda.kt") public void testLocalFunctionWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberFunction.kt") public void testMemberFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberFunctionParameters.kt") public void testMemberFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberFunctionParametersWithLambda.kt") public void testMemberFunctionParametersWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberFunctionWithLambda.kt") public void testMemberFunctionWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelFunctionParameters.kt") public void testTopLevelFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelFunctionParametersWithLambda.kt") public void testTopLevelFunctionParametersWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelFunctionWithLambda.kt") public void testTopLevelFunctionWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt"); doExtractFunctionTest(fileName); } } @@ -1689,56 +1689,56 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/properties") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Properties extends AbstractJetExtractionTest { + public static class Properties extends AbstractExtractionTest { public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/properties"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localProperty.kt") public void testLocalProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localPropertyWithLambda.kt") public void testLocalPropertyWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberProperty.kt") public void testMemberProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("memberPropertyWithLambda.kt") public void testMemberPropertyWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nestedInMultiDeclaration.kt") public void testNestedInMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/nestedInMultiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/nestedInMultiDeclaration.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelProperty.kt") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("topLevelPropertyWithLambda.kt") public void testTopLevelPropertyWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt"); doExtractFunctionTest(fileName); } } @@ -1747,118 +1747,118 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Parameters extends AbstractJetExtractionTest { + public static class Parameters extends AbstractExtractionTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CandidateTypes extends AbstractJetExtractionTest { + public static class CandidateTypes extends AbstractExtractionTest { public void testAllFilesPresentInCandidateTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/candidateTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/candidateTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cantLiftAnonymousToSupertype.kt") public void testCantLiftAnonymousToSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt"); doExtractFunctionTest(fileName); } @TestMetadata("flexibleTypesWithNull.kt") public void testFlexibleTypesWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt"); doExtractFunctionTest(fileName); } @TestMetadata("flexibleTypesWithoutNull.kt") public void testFlexibleTypesWithoutNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt"); doExtractFunctionTest(fileName); } @TestMetadata("liftAnonymousToSupertype1.kt") public void testLiftAnonymousToSupertype1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("liftAnonymousToSupertype2.kt") public void testLiftAnonymousToSupertype2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleTypes.kt") public void testMultipleTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleTypes2.kt") public void testMultipleTypes2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleTypes3.kt") public void testMultipleTypes3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes3.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleTypes4.kt") public void testMultipleTypes4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/multipleTypes4.kt"); doExtractFunctionTest(fileName); } @TestMetadata("mutablyFlexibleType.kt") public void testMutablyFlexibleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nonNullableTypes.kt") public void testNonNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt"); doExtractFunctionTest(fileName); } @TestMetadata("nullableTypes.kt") public void testNullableTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt"); doExtractFunctionTest(fileName); } @TestMetadata("receiverCandidateTypes.kt") public void testReceiverCandidateTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeHierarchy1.kt") public void testTypeHierarchy1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeHierarchy2.kt") public void testTypeHierarchy2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeHierarchy3.kt") public void testTypeHierarchy3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeHierarchy4.kt") public void testTypeHierarchy4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt"); doExtractFunctionTest(fileName); } } @@ -1866,38 +1866,38 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CapturedFunctions extends AbstractJetExtractionTest { + public static class CapturedFunctions extends AbstractExtractionTest { public void testAllFilesPresentInCapturedFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/capturedFunctions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/capturedFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deeplyLocalFun.kt") public void testDeeplyLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/deeplyLocalFun.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localExtensionFun.kt") public void testLocalExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFun.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localExtensionFunChainedCalls.kt") public void testLocalExtensionFunChainedCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunChainedCalls.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localExtensionFunInfixCall.kt") public void testLocalExtensionFunInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localExtensionFunInfixCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/capturedFunctions/localFun.kt"); doExtractFunctionTest(fileName); } } @@ -1905,32 +1905,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ExtractSuper extends AbstractJetExtractionTest { + public static class ExtractSuper extends AbstractExtractionTest { public void testAllFilesPresentInExtractSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractSuper"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractSuper"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("labeledSuperPropertyCall.kt") public void testLabeledSuperPropertyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("superFunctionCall.kt") public void testSuperFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superFunctionCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("superLabeledFunctionCall.kt") public void testSuperLabeledFunctionCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superLabeledFunctionCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superLabeledFunctionCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("superPropertyCall.kt") public void testSuperPropertyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.kt"); doExtractFunctionTest(fileName); } } @@ -1938,122 +1938,122 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ExtractThis extends AbstractJetExtractionTest { + public static class ExtractThis extends AbstractExtractionTest { public void testAllFilesPresentInExtractThis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractThis"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractThis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("explicitLabeledThisInMember.kt") public void testExplicitLabeledThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt"); doExtractFunctionTest(fileName); } @TestMetadata("explicitThisInExtension.kt") public void testExplicitThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt"); doExtractFunctionTest(fileName); } @TestMetadata("explicitThisInMember.kt") public void testExplicitThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt"); doExtractFunctionTest(fileName); } @TestMetadata("explicitThisWithSmartCast.kt") public void testExplicitThisWithSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt"); doExtractFunctionTest(fileName); } @TestMetadata("implicitAndExplicitLabeledThisInMember.kt") public void testImplicitAndExplicitLabeledThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt"); doExtractFunctionTest(fileName); } @TestMetadata("implicitAndExplicitThisInExtension.kt") public void testImplicitAndExplicitThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt"); doExtractFunctionTest(fileName); } @TestMetadata("implicitThisInExtension.kt") public void testImplicitThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt"); doExtractFunctionTest(fileName); } @TestMetadata("implicitThisInMember.kt") public void testImplicitThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt"); doExtractFunctionTest(fileName); } @TestMetadata("implicitThisWithSmartCast.kt") public void testImplicitThisWithSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt"); doExtractFunctionTest(fileName); } @TestMetadata("javaSyntheticProperty.kt") public void testJavaSyntheticProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticProperty.kt"); doExtractFunctionTest(fileName); } @TestMetadata("javaSyntheticPropertyWithDelegation.kt") public void testJavaSyntheticPropertyWithDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithDelegation.kt"); doExtractFunctionTest(fileName); } @TestMetadata("javaSyntheticPropertyWithOverride.kt") public void testJavaSyntheticPropertyWithOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/javaSyntheticPropertyWithOverride.kt"); doExtractFunctionTest(fileName); } @TestMetadata("missingReceiver.kt") public void testMissingReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/missingReceiver.kt"); doExtractFunctionTest(fileName); } @TestMetadata("paramAsExplicitInvoke.kt") public void testParamAsExplicitInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/paramAsExplicitInvoke.kt"); doExtractFunctionTest(fileName); } @TestMetadata("paramWithExtensionInvoke.kt") public void testParamWithExtensionInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/paramWithExtensionInvoke.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedThis.kt") public void testQualifiedThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedThisAsArgument.kt") public void testQualifiedThisAsArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt"); doExtractFunctionTest(fileName); } @TestMetadata("thisAsExplicitInvoke.kt") public void testThisAsExplicitInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsExplicitInvoke.kt"); doExtractFunctionTest(fileName); } @TestMetadata("thisAsImplicitInvoke.kt") public void testThisAsImplicitInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/thisAsImplicitInvoke.kt"); doExtractFunctionTest(fileName); } } @@ -2061,32 +2061,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/it") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class It extends AbstractJetExtractionTest { + public static class It extends AbstractExtractionTest { public void testAllFilesPresentInIt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/it"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/it"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerIt.kt") public void testInnerIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt"); doExtractFunctionTest(fileName); } @TestMetadata("lambdaWithIt.kt") public void testLambdaWithIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt"); doExtractFunctionTest(fileName); } @TestMetadata("outerIt.kt") public void testOuterIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt"); doExtractFunctionTest(fileName); } @TestMetadata("simpleIt.kt") public void testSimpleIt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt"); doExtractFunctionTest(fileName); } } @@ -2094,164 +2094,164 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/misc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Misc extends AbstractJetExtractionTest { + public static class Misc extends AbstractExtractionTest { @TestMetadata("addPrefixToBackticks.kt") public void testAddPrefixToBackticks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt"); doExtractFunctionTest(fileName); } public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/misc"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/misc"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("extensionLambda.kt") public void testExtensionLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt"); doExtractFunctionTest(fileName); } @TestMetadata("extensionLambdaAsParameter.kt") public void testExtensionLambdaAsParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/extensionLambdaAsParameter.kt"); doExtractFunctionTest(fileName); } @TestMetadata("idWithBackticks.kt") public void testIdWithBackticks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/idWithBackticks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/idWithBackticks.kt"); doExtractFunctionTest(fileName); } @TestMetadata("idWithRequiredBackticks.kt") public void testIdWithRequiredBackticks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/idWithRequiredBackticks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/idWithRequiredBackticks.kt"); doExtractFunctionTest(fileName); } @TestMetadata("innerClassObject.kt") public void testInnerClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("kt5001.kt") public void testKt5001() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt"); doExtractFunctionTest(fileName); } @TestMetadata("multipleOccurrences.kt") public void testMultipleOccurrences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt"); doExtractFunctionTest(fileName); } @TestMetadata("namedArguments.kt") public void testNamedArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/namedArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/namedArguments.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedAnnotation.kt") public void testQualifiedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedClassObject.kt") public void testQualifiedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedEnum.kt") public void testQualifiedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedObject.kt") public void testQualifiedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedPackage.kt") public void testQualifiedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedTypeArg.kt") public void testQualifiedTypeArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedTypeInValueArg.kt") public void testQualifiedTypeInValueArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt"); doExtractFunctionTest(fileName); } @TestMetadata("qualifiedTypeRef.kt") public void testQualifiedTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("reducedParameterList.kt") public void testReducedParameterList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt"); doExtractFunctionTest(fileName); } @TestMetadata("replaceWithBackticks.kt") public void testReplaceWithBackticks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/replaceWithBackticks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/replaceWithBackticks.kt"); doExtractFunctionTest(fileName); } @TestMetadata("replaceWithBackticks2.kt") public void testReplaceWithBackticks2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/replaceWithBackticks2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/replaceWithBackticks2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("thisInObject.kt") public void testThisInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/thisInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/thisInObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeRef.kt") public void testTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("usagesInCallArgs.kt") public void testUsagesInCallArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt"); doExtractFunctionTest(fileName); } @TestMetadata("variableAsFunction.kt") public void testVariableAsFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt"); doExtractFunctionTest(fileName); } } @@ -2259,50 +2259,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class NonDenotableTypes extends AbstractJetExtractionTest { + public static class NonDenotableTypes extends AbstractExtractionTest { public void testAllFilesPresentInNonDenotableTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt"); doExtractFunctionTest(fileName); } @TestMetadata("anonymousObjectWithCall.kt") public void testAnonymousObjectWithCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClass.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassWithSuperclass.kt") public void testLocalClassWithSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclass.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassWithSuperclassParameter.kt") public void testLocalClassWithSuperclassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameter.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassWithSuperclassParameterInLocalFun.kt") public void testLocalClassWithSuperclassParameterInLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterInLocalFun.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassWithSuperclassParameterNoApproximation.kt") public void testLocalClassWithSuperclassParameterNoApproximation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterNoApproximation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClassWithSuperclassParameterNoApproximation.kt"); doExtractFunctionTest(fileName); } } @@ -2311,110 +2311,110 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameters extends AbstractJetExtractionTest { + public static class TypeParameters extends AbstractExtractionTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localClassInBound.kt") public void testLocalClassInBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt"); doExtractFunctionTest(fileName); } @TestMetadata("localClassInTypeConstraint.kt") public void testLocalClassInTypeConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt"); doExtractFunctionTest(fileName); } @TestMetadata("noVarianceInFun.kt") public void testNoVarianceInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/noVarianceInFun.kt"); doExtractFunctionTest(fileName); } @TestMetadata("simpleTypeParameter.kt") public void testSimpleTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt"); doExtractFunctionTest(fileName); } @TestMetadata("simpleTypeParameterWithConstraint.kt") public void testSimpleTypeParameterWithConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParamInArgument.kt") public void testTypeParamInArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParameterNotResolvableInTargetScope.kt") public void testTypeParameterNotResolvableInTargetScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParameterRef.kt") public void testTypeParameterRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParameterRefCanOmit.kt") public void testTypeParameterRefCanOmit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParameterResolvableInTargetScope.kt") public void testTypeParameterResolvableInTargetScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParameterResolvableInTargetScope.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersAndConstraintsCombined1.kt") public void testTypeParametersAndConstraintsCombined1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersAndConstraintsCombined2.kt") public void testTypeParametersAndConstraintsCombined2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersAndConstraintsCombined3.kt") public void testTypeParametersAndConstraintsCombined3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersCombined1.kt") public void testTypeParametersCombined1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersCombined2.kt") public void testTypeParametersCombined2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersCombined3.kt") public void testTypeParametersCombined3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt"); doExtractFunctionTest(fileName); } @TestMetadata("typeParametersCombinedAndThis.kt") public void testTypeParametersCombinedAndThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt"); doExtractFunctionTest(fileName); } } @@ -2423,188 +2423,188 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IntroduceProperty extends AbstractJetExtractionTest { + public static class IntroduceProperty extends AbstractExtractionTest { public void testAllFilesPresentInIntroduceProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("extractExtensionWithInitializer.kt") public void testExtractExtensionWithInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractExtensionWithInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractExtensionWithInitializer.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractFromDefaultValueInConstructor.kt") public void testExtractFromDefaultValueInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractFromDefaultValueInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractFromDefaultValueInConstructor.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractFromDefaultValueInFun.kt") public void testExtractFromDefaultValueInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractFromDefaultValueInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractFromDefaultValueInFun.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyExtension.kt") public void testExtractLazyExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyExtension.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyMultipleExpressions.kt") public void testExtractLazyMultipleExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyMultipleExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyMultipleExpressions.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyToClass.kt") public void testExtractLazyToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToClass.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyToFile.kt") public void testExtractLazyToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToFile.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyToTrait.kt") public void testExtractLazyToTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyToTrait.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyWithBlock.kt") public void testExtractLazyWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyWithBlock.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractLazyWithCallSiteReturn.kt") public void testExtractLazyWithCallSiteReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyWithCallSiteReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractLazyWithCallSiteReturn.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractToClassWithNameClash.kt") public void testExtractToClassWithNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToClassWithNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToClassWithNameClash.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractToClassWithNameClashAndAnonymousInitializer.kt") public void testExtractToClassWithNameClashAndAnonymousInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToClassWithNameClashAndAnonymousInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToClassWithNameClashAndAnonymousInitializer.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractToFileWithNameClash.kt") public void testExtractToFileWithNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToFileWithNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToFileWithNameClash.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractToFunction.kt") public void testExtractToFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractToFunction.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractUnit.kt") public void testExtractUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractUnit.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithGetterMultipleExpressions.kt") public void testExtractWithGetterMultipleExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterMultipleExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterMultipleExpressions.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithGetterToClass.kt") public void testExtractWithGetterToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithGetterToFile.kt") public void testExtractWithGetterToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithGetterToTrait.kt") public void testExtractWithGetterToTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerAndBlock.kt") public void testExtractWithInitializerAndBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndBlock.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerAndCallSiteReturn.kt") public void testExtractWithInitializerAndCallSiteReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndCallSiteReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndCallSiteReturn.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerAndSingleElementBlock.kt") public void testExtractWithInitializerAndSingleElementBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndSingleElementBlock.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerAndSingleElementBlock.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerMultipleExpressions.kt") public void testExtractWithInitializerMultipleExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerMultipleExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerMultipleExpressions.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerToClass.kt") public void testExtractWithInitializerToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToClass.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerToFile.kt") public void testExtractWithInitializerToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToFile.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithInitializerToTrait.kt") public void testExtractWithInitializerToTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithInitializerToTrait.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("extractWithParams.kt") public void testExtractWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/extractWithParams.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("replaceDuplicates.kt") public void testReplaceDuplicates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/replaceDuplicates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/replaceDuplicates.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("typeParameterNotResolvableInTargetScope.kt") public void testTypeParameterNotResolvableInTargetScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/typeParameterNotResolvableInTargetScope.kt"); doIntroducePropertyTest(fileName); } @TestMetadata("typeParameterResolvableInTargetScope.kt") public void testTypeParameterResolvableInTargetScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/typeParameterResolvableInTargetScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceProperty/typeParameterResolvableInTargetScope.kt"); doIntroducePropertyTest(fileName); } } @@ -2612,296 +2612,296 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IntroduceParameter extends AbstractJetExtractionTest { + public static class IntroduceParameter extends AbstractExtractionTest { public void testAllFilesPresentInIntroduceParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/assignment.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classInAnonymousInitializer.kt") public void testClassInAnonymousInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classInAnonymousInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classInAnonymousInitializer.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classInPropertyInitializer.kt") public void testClassInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classInPropertyInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classInPropertyInitializer.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classMultipleUsages1.kt") public void testClassMultipleUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsages1.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classMultipleUsages2.kt") public void testClassMultipleUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsages2.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classMultipleUsagesOutsideScope.kt") public void testClassMultipleUsagesOutsideScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesOutsideScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesOutsideScope.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classMultipleUsagesSingleReplace1.kt") public void testClassMultipleUsagesSingleReplace1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesSingleReplace1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesSingleReplace1.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classMultipleUsagesSingleReplace2.kt") public void testClassMultipleUsagesSingleReplace2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesSingleReplace2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classMultipleUsagesSingleReplace2.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classNoParams.kt") public void testClassNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classNoParams.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classParameterInFunctionBody.kt") public void testClassParameterInFunctionBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classParameterInFunctionBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classParameterInFunctionBody.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classParameterUsedOutside.kt") public void testClassParameterUsedOutside() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classParameterUsedOutside.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classParameterUsedOutside.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classUnusedParameter.kt") public void testClassUnusedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classUnusedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classUnusedParameter.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("classUsedParameter.kt") public void testClassUsedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classUsedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/classUsedParameter.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("defaultValueInParens.kt") public void testDefaultValueInParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/defaultValueInParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/defaultValueInParens.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("defaultValueNoTempVar.kt") public void testDefaultValueNoTempVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/defaultValueNoTempVar.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("forbiddenUsages.kt") public void testForbiddenUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/forbiddenUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/forbiddenUsages.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("foreignParameterRef.kt") public void testForeignParameterRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/foreignParameterRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/foreignParameterRef.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("fun.kt") public void testFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/fun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/fun.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionMultipleUnusedParameters.kt") public void testFunctionMultipleUnusedParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUnusedParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUnusedParameters.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionMultipleUsages.kt") public void testFunctionMultipleUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUsages.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionMultipleUsagesSingleReplace.kt") public void testFunctionMultipleUsagesSingleReplace() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUsagesSingleReplace.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionMultipleUsagesSingleReplace.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionUnusedParameter.kt") public void testFunctionUnusedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionUnusedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionUnusedParameter.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionUsedParameter.kt") public void testFunctionUsedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionUsedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionUsedParameter.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionWithApproximatedType.kt") public void testFunctionWithApproximatedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionWithApproximatedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionWithApproximatedType.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("functionWithDefaultValue.kt") public void testFunctionWithDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionWithDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/functionWithDefaultValue.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("lambdaArgument.kt") public void testLambdaArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/lambdaArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/lambdaArgument.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("localVar.kt") public void testLocalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/localVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/localVar.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("partialSubstitution.kt") public void testPartialSubstitution() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/partialSubstitution.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/partialSubstitution.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("propertyAccessor.kt") public void testPropertyAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/propertyAccessor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/propertyAccessor.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("return.kt") public void testReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/return.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/return.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("secondaryConstructorWithDefaultValue.kt") public void testSecondaryConstructorWithDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/secondaryConstructorWithDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/secondaryConstructorWithDefaultValue.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteBinaryExpressions.kt") public void testSubstituteBinaryExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteBinaryExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteBinaryExpressions.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteCallExpressions.kt") public void testSubstituteCallExpressions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteCallExpressions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteCallExpressions.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteDelegationCallsNoTempVar.kt") public void testSubstituteDelegationCallsNoTempVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteDelegationCallsNoTempVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteDelegationCallsNoTempVar.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteDoubleReceiver.kt") public void testSubstituteDoubleReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteDoubleReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteDoubleReceiver.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteExplicitThisInMember.kt") public void testSubstituteExplicitThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteExplicitThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteExplicitThisInMember.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteImplicitThisInMember.kt") public void testSubstituteImplicitThisInMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteImplicitThisInMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteImplicitThisInMember.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteInPrimaryConstructorCall.kt") public void testSubstituteInPrimaryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInPrimaryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInPrimaryConstructorCall.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteInSecondaryConstructorCall.kt") public void testSubstituteInSecondaryConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInSecondaryConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInSecondaryConstructorCall.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteIncrement.kt") public void testSubstituteIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteIncrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteIncrement.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("substituteInfixCall.kt") public void testSubstituteInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInfixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/substituteInfixCall.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("throw.kt") public void testThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/throw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/throw.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("unusedDispatchReceiver.kt") public void testUnusedDispatchReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/unusedDispatchReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/unusedDispatchReceiver.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("unusedExtensionReceiver.kt") public void testUnusedExtensionReceiver() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/unusedExtensionReceiver.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/unusedExtensionReceiver.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("valueAtCallSite.kt") public void testValueAtCallSite() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/valueAtCallSite.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/valueAtCallSite.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("valueAtCallSiteMultipleUsages.kt") public void testValueAtCallSiteMultipleUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/valueAtCallSiteMultipleUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/valueAtCallSiteMultipleUsages.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/varargs.kt"); doIntroduceSimpleParameterTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceParameter/while.kt"); doIntroduceSimpleParameterTest(fileName); } } @@ -2909,62 +2909,62 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceLambdaParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IntroduceLambdaParameter extends AbstractJetExtractionTest { + public static class IntroduceLambdaParameter extends AbstractExtractionTest { public void testAllFilesPresentInIntroduceLambdaParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceLambdaParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceLambdaParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("lambdaArgument.kt") public void testLambdaArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaArgument.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamInPrimaryConstructor.kt") public void testLambdaParamInPrimaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamInPrimaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamInPrimaryConstructor.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamMultiline.kt") public void testLambdaParamMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamMultiline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamMultiline.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamNoDefaultValue.kt") public void testLambdaParamNoDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoDefaultValue.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamNoDefaultValueSecondLambda.kt") public void testLambdaParamNoDefaultValueSecondLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoDefaultValueSecondLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoDefaultValueSecondLambda.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamNoParams.kt") public void testLambdaParamNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamNoParams.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamOfNothing.kt") public void testLambdaParamOfNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamOfNothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamOfNothing.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamOfUnit.kt") public void testLambdaParamOfUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamOfUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamOfUnit.kt"); doIntroduceLambdaParameterTest(fileName); } @TestMetadata("lambdaParamWithDefaultValue.kt") public void testLambdaParamWithDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamWithDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceLambdaParameter/lambdaParamWithDefaultValue.kt"); doIntroduceLambdaParameterTest(fileName); } } @@ -2972,20 +2972,20 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceJavaParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class IntroduceJavaParameter extends AbstractJetExtractionTest { + public static class IntroduceJavaParameter extends AbstractExtractionTest { public void testAllFilesPresentInIntroduceJavaParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceJavaParameter"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceJavaParameter"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("javaMethod.java") public void testJavaMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceJavaParameter/javaMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceJavaParameter/javaMethod.java"); doIntroduceJavaParameterTest(fileName); } @TestMetadata("javaMethodOverridingKotlinFunctionWithUsages.java") public void testJavaMethodOverridingKotlinFunctionWithUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceJavaParameter/javaMethodOverridingKotlinFunctionWithUsages.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceJavaParameter/javaMethodOverridingKotlinFunctionWithUsages.java"); doIntroduceJavaParameterTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java index 0966e43cf47..a2cb2752bb7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.move; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,416 +30,416 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/refactoring/move") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetMoveTestGenerated extends AbstractJetMoveTest { +public class MoveTestGenerated extends AbstractMoveTest { public void testAllFilesPresentInMove() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$")); } @TestMetadata("java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test") public void testJava_moveClass_moveAsMember_moveClassToExternalNestedClass_MoveClassToExternalNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test") public void testJava_moveClass_moveAsMember_moveClassToNestedSiblingClass_MoveClassToNestedSiblingClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test") public void testJava_moveClass_moveAsMember_moveClassToTopLevelClass_MoveClassToTopLevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test") public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePackageLocal_MoveClassToTopLevelClassAndMakePackageLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test") public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePrivate_MoveClassToTopLevelClassAndMakePrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test") public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassOfAnotherPackage_MoveClassToTopLevelClassOfAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test") public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInAnotherPackage_MoveNestedClassToTopLevelInAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test") public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackage_MoveNestedClassToTopLevelInTheSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test") public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstance.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda.test") public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda_MoveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test") public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndRename_MoveNestedClassToTopLevelInTheSamePackageAndRename() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test") public void testJava_moveClass_moveTop_moveTopLevelClassToAnotherPackage_MoveTopLevelClassToAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test") public void testJava_moveClass_moveTopToInner_moveTopLevelClassToNestedClass_MoveTopLevelClassToTopLevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test") public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClass_MoveTopLevelClassToTopLevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test"); doTest(fileName); } @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test") public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClassOfAnotherPackage_MoveTopLevelClassToTopLevelClassOfAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test") public void testJava_moveField_moveFieldToExternalNestedClass_MoveFieldToExternalNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test") public void testJava_moveField_moveFieldToNestedSiblingClass_MoveFieldToNestedSiblingClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test") public void testJava_moveField_moveFieldToTopLevelClass_MoveFieldToTopLevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test") public void testJava_moveField_moveFieldToTopLevelClassAndMakePackageLocal_MoveFieldToTopLevelClassAndMakePackageLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test") public void testJava_moveField_moveFieldToTopLevelClassAndMakePrivate_MoveFieldToTopLevelClassAndMakePrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test"); doTest(fileName); } @TestMetadata("java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test") public void testJava_moveField_moveFieldToTopLevelClassOfAnotherPackage_MoveFieldToTopLevelClassOfAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test") public void testJava_moveFile_moveFileToAnotherPackage_MoveFileToAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test") public void testJava_moveMethod_moveMethodToExternalNestedClass_MoveMethodToExternalNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test") public void testJava_moveMethod_moveMethodToNestedSiblingClass_MoveMethodToNestedSiblingClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test") public void testJava_moveMethod_moveMethodToTopLevelClass_MoveMethodToTopLevelClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test") public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePackageLocal_MoveMethodToTopLevelClassAndMakePackageLocal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test") public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePrivate_MoveMethodToTopLevelClassAndMakePrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test"); doTest(fileName); } @TestMetadata("java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test") public void testJava_moveMethod_moveMethodToTopLevelClassOfAnotherPackage_MoveMethodToTopLevelClassOfAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test"); doTest(fileName); } @TestMetadata("java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test") public void testJava_movePackage_movePackageToAnotherPackage_MovePackageToAnotherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test"); doTest(fileName); } @TestMetadata("kotlin/changePackage/addExtensionImport/addExtensionImport.test") public void testKotlin_changePackage_addExtensionImport_AddExtensionImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/addExtensionImport/addExtensionImport.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/addExtensionImport/addExtensionImport.test"); doTest(fileName); } @TestMetadata("kotlin/changePackage/changeToDefaultPackage/changeToDefaultPackage.test") public void testKotlin_changePackage_changeToDefaultPackage_ChangeToDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/changeToDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/changeToDefaultPackage/changeToDefaultPackage.test"); doTest(fileName); } @TestMetadata("kotlin/changePackage/changeToNonDefaultPackage/changeToNonDefaultPackage.test") public void testKotlin_changePackage_changeToNonDefaultPackage_ChangeToNonDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/changeToNonDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/changePackage/changeToNonDefaultPackage/changeToNonDefaultPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveDirectory/moveDirectory.test") public void testKotlin_moveDirectory_MoveDirectory() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectory.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveDirectory/moveDirectory.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/addExtensionImport/addExtensionImport.test") public void testKotlin_moveFile_addExtensionImport_AddExtensionImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/addExtensionImport/addExtensionImport.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/internalReferences/internalReferences.test") public void testKotlin_moveFile_internalReferences_InternalReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/internalReferences/internalReferences.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/internalReferences/internalReferences.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/invalidTargetPackage/moveFileToInvalidPackage.test") public void testKotlin_moveFile_invalidTargetPackage_MoveFileToInvalidPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/invalidTargetPackage/moveFileToInvalidPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/invalidTargetPackage/moveFileToInvalidPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/moveFileToFile/moveFileToFile.test") public void testKotlin_moveFile_moveFileToFile_MoveFileToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileToFile/moveFileToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileToFile/moveFileToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test") public void testKotlin_moveFile_moveFileWithoutPackageRename_MoveFileWithoutPackageRename() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test") public void testKotlin_moveFile_moveFileWithPackageRename_MoveFileWithPackageRename() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test"); doTest(fileName); } @TestMetadata("kotlin/moveFile/moveLastFileInPackageWithPackageRename/moveLastFileInPackageWithPackageRename.test") public void testKotlin_moveFile_moveLastFileInPackageWithPackageRename_MoveLastFileInPackageWithPackageRename() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/moveLastFileInPackageWithPackageRename.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveLastFileInPackageWithPackageRename/moveLastFileInPackageWithPackageRename.test"); doTest(fileName); } @TestMetadata("kotlin/movePackage/movePackage/movePackage.test") public void testKotlin_movePackage_movePackage_MovePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/delegateInObject/delegateInObject.test") public void testKotlin_moveTopLevelDeclarations_misc_delegateInObject_DelegateInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/delegateInObject/delegateInObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/delegateInObject/delegateInObject.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/fakeOverrideInObject/fakeOverrideInObject.test") public void testKotlin_moveTopLevelDeclarations_misc_fakeOverrideInObject_FakeOverrideInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/fakeOverrideInObject/fakeOverrideInObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/fakeOverrideInObject/fakeOverrideInObject.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/internalReferences/internalReferences.test") public void testKotlin_moveTopLevelDeclarations_misc_internalReferences_InternalReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/internalReferences.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/internalReferences/internalReferences.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassFromDefaultPackage/moveClassFromDefaultPackage.test") public void testKotlin_moveTopLevelDeclarations_misc_moveClassFromDefaultPackage_MoveClassFromDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassFromDefaultPackage/moveClassFromDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassFromDefaultPackage/moveClassFromDefaultPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassToDefaultPackage/moveClassToDefaultPackage.test") public void testKotlin_moveTopLevelDeclarations_misc_moveClassToDefaultPackage_MoveClassToDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassToDefaultPackage/moveClassToDefaultPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassToDefaultPackage/moveClassToDefaultPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test") public void testKotlin_moveTopLevelDeclarations_misc_moveClassWithImportsRetained_MoveClassWithImportsRetained() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test") public void testKotlin_moveTopLevelDeclarations_misc_moveFunctionWithImportsRetained_MoveFunctionWithImportsRetained() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/selfReferences/selfReferences.test") public void testKotlin_moveTopLevelDeclarations_misc_selfReferences_SelfReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/selfReferences.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/selfReferences/selfReferences.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/singletonsAndStatics.test") public void testKotlin_moveTopLevelDeclarations_misc_singletonsAndStatics_SingletonsAndStatics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/singletonsAndStatics.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/singletonsAndStatics/singletonsAndStatics.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/superReferences/superReferences.test") public void testKotlin_moveTopLevelDeclarations_misc_superReferences_SuperReferences() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/superReferences/superReferences.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/superReferences/superReferences.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/misc/syntheticMembers/syntheticMembers.test") public void testKotlin_moveTopLevelDeclarations_misc_syntheticMembers_SyntheticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/syntheticMembers/syntheticMembers.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/syntheticMembers/syntheticMembers.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test") public void testKotlin_moveTopLevelDeclarations_moveClassToFile_MoveClassToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveClassToPackage_MoveClassToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test") public void testKotlin_moveTopLevelDeclarations_moveClassToPackageWithConflicts_MoveClassToPackageWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveExtensionFunctionToFil_MoveExtensionFunctionToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test") public void testKotlin_moveTopLevelDeclarations_moveExtensionPropertyToFile_MoveExtensionPropertyToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToFile_MoveFunctionToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageUsedInJava_MoveFunctionToPackageUsedInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageUsedInJava/moveFunctionToPackageUsedInJava.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test") public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageWithConflicts_MoveFunctionToPackageWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test") public void testKotlin_moveTopLevelDeclarations_moveObjectToFile_MoveObjectToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test") public void testKotlin_moveTopLevelDeclarations_moveObjectToPackage_MoveObjectToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test") public void testKotlin_moveTopLevelDeclarations_moveObjectToPackageWithConflicts_MoveObjectToPackageWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test") public void testKotlin_moveTopLevelDeclarations_moveOnlyFunctionToPackageUsedInJava_MoveOnlyFunctionToPackageUsedInJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveOnlyFunctionToPackageUsedInJava/moveOnlyFunctionToPackageUsedInJava.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test") public void testKotlin_moveTopLevelDeclarations_movePropertyToFile_MovePropertyToFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test") public void testKotlin_moveTopLevelDeclarations_movePropertyToPackage_MovePropertyToPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test"); doTest(fileName); } @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test") public void testKotlin_moveTopLevelDeclarations_movePropertyToPackageWithConflicts_MovePropertyToPackageWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java index 17b13f31c2f..3c5ee6e8931 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.pullUp; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -35,191 +35,191 @@ public class PullUpTestGenerated extends AbstractPullUpTest { public static class K2K extends AbstractPullUpTest { @TestMetadata("accidentalOverrides.kt") public void testAccidentalOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/accidentalOverrides.kt"); doKotlinTest(fileName); } public void testAllFilesPresentInK2K() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/k2k"), Pattern.compile("^(.+)\\.kt$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/k2k"), Pattern.compile("^(.+)\\.kt$")); } @TestMetadata("clashWithSuper.kt") public void testClashWithSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/clashWithSuper.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToClass.kt") public void testFromClassToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClass.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToClassMakeAbstract.kt") public void testFromClassToClassMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassMakeAbstract.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToClassWithGenerics.kt") public void testFromClassToClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToInterface.kt") public void testFromClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToInterfaceMakeAbstract.kt") public void testFromClassToInterfaceMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/fromClassToInterfaceMakeAbstract.kt"); doKotlinTest(fileName); } @TestMetadata("implicitCompanionUsages.kt") public void testImplicitCompanionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/implicitCompanionUsages.kt"); doKotlinTest(fileName); } @TestMetadata("inaccessibleMemberUsed.kt") public void testInaccessibleMemberUsed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt"); doKotlinTest(fileName); } @TestMetadata("initializerInConstructor.kt") public void testInitializerInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInConstructor.kt"); doKotlinTest(fileName); } @TestMetadata("initializerInMultipleConstructorsEq.kt") public void testInitializerInMultipleConstructorsEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsEq.kt"); doKotlinTest(fileName); } @TestMetadata("initializerInMultipleConstructorsNonEq.kt") public void testInitializerInMultipleConstructorsNonEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/initializerInMultipleConstructorsNonEq.kt"); doKotlinTest(fileName); } @TestMetadata("innerClassToInterface.kt") public void testInnerClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/innerClassToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("moveAllSuperInterfaces.kt") public void testMoveAllSuperInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfaces.kt"); doKotlinTest(fileName); } @TestMetadata("moveAllSuperInterfacesWithGenerics.kt") public void testMoveAllSuperInterfacesWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveAllSuperInterfacesWithGenerics.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfaces.kt") public void testMoveSuperInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaces.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfacesToEmptySpecifierList.kt") public void testMoveSuperInterfacesToEmptySpecifierList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfacesToEmptySpecifierList.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfaceToItSelf.kt") public void testMoveSuperInterfaceToItSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/moveSuperInterfaceToItSelf.kt"); doKotlinTest(fileName); } @TestMetadata("multipleInitializersInConstructorsEq.kt") public void testMultipleInitializersInConstructorsEq() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/multipleInitializersInConstructorsEq.kt"); doKotlinTest(fileName); } @TestMetadata("noCaret.kt") public void testNoCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noCaret.kt"); doKotlinTest(fileName); } @TestMetadata("noClashWithAbstractSuper.kt") public void testNoClashWithAbstractSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noClashWithAbstractSuper.kt"); doKotlinTest(fileName); } @TestMetadata("noInitializationInInterface.kt") public void testNoInitializationInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noInitializationInInterface.kt"); doKotlinTest(fileName); } @TestMetadata("noSuperClass.kt") public void testNoSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noSuperClass.kt"); doKotlinTest(fileName); } @TestMetadata("outsideOfClass.kt") public void testOutsideOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt"); doKotlinTest(fileName); } @TestMetadata("parametersInPrimaryInitializer.kt") public void testParametersInPrimaryInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/parametersInPrimaryInitializer.kt"); doKotlinTest(fileName); } @TestMetadata("propertyDependenceSatisfied.kt") public void testPropertyDependenceSatisfied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceSatisfied.kt"); doKotlinTest(fileName); } @TestMetadata("propertyDependenceUnsatisfied.kt") public void testPropertyDependenceUnsatisfied() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/propertyDependenceUnsatisfied.kt"); doKotlinTest(fileName); } @TestMetadata("publicToInterface.kt") public void testPublicToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/publicToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/publicToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("superToThis.kt") public void testSuperToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/superToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/superToThis.kt"); doKotlinTest(fileName); } @TestMetadata("toIndirectSuperClass.kt") public void testToIndirectSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/toIndirectSuperClass.kt"); doKotlinTest(fileName); } @TestMetadata("usedPrivateToClass.kt") public void testUsedPrivateToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/usedPrivateToClass.kt"); doKotlinTest(fileName); } } @@ -229,66 +229,66 @@ public class PullUpTestGenerated extends AbstractPullUpTest { @RunWith(JUnit3RunnerWithInners.class) public static class K2J extends AbstractPullUpTest { public void testAllFilesPresentInK2J() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/k2j"), Pattern.compile("^(.+)\\.kt$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/k2j"), Pattern.compile("^(.+)\\.kt$")); } @TestMetadata("fromClassToClass.kt") public void testFromClassToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClass.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToClassAndMakeAbstract.kt") public void testFromClassToClassAndMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClassAndMakeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClassAndMakeAbstract.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToClassWithGenerics.kt") public void testFromClassToClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToInterface.kt") public void testFromClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("fromClassToNestedClass.kt") public void testFromClassToNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/fromClassToNestedClass.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfacesToClass.kt") public void testMoveSuperInterfacesToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesToClass.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfacesToInterface.kt") public void testMoveSuperInterfacesToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("moveSuperInterfacesWithGenerics.kt") public void testMoveSuperInterfacesWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/moveSuperInterfacesWithGenerics.kt"); doKotlinTest(fileName); } @TestMetadata("publicToInterface.kt") public void testPublicToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/publicToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/publicToInterface.kt"); doKotlinTest(fileName); } @TestMetadata("usedPrivateToClass.kt") public void testUsedPrivateToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/usedPrivateToClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2j/usedPrivateToClass.kt"); doKotlinTest(fileName); } } @@ -298,60 +298,60 @@ public class PullUpTestGenerated extends AbstractPullUpTest { @RunWith(JUnit3RunnerWithInners.class) public static class J2K extends AbstractPullUpTest { public void testAllFilesPresentInJ2K() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/j2k"), Pattern.compile("^(.+)\\.java$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pullUp/j2k"), Pattern.compile("^(.+)\\.java$")); } @TestMetadata("fromClassToClass.java") public void testFromClassToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClass.java"); doJavaTest(fileName); } @TestMetadata("fromClassToClassAndMakeAbstract.java") public void testFromClassToClassAndMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClassAndMakeAbstract.java"); doJavaTest(fileName); } @TestMetadata("fromClassToClassWithGenerics.java") public void testFromClassToClassWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToClassWithGenerics.java"); doJavaTest(fileName); } @TestMetadata("fromClassToInterface.java") public void testFromClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToInterface.java"); doJavaTest(fileName); } @TestMetadata("fromClassToInterfaceWithConflicts.java") public void testFromClassToInterfaceWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToInterfaceWithConflicts.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToInterfaceWithConflicts.java"); doJavaTest(fileName); } @TestMetadata("fromClassToNestedClass.java") public void testFromClassToNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/fromClassToNestedClass.java"); doJavaTest(fileName); } @TestMetadata("moveSuperInterfacesToClass.java") public void testMoveSuperInterfacesToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesToClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesToClass.java"); doJavaTest(fileName); } @TestMetadata("moveSuperInterfacesToInterface.java") public void testMoveSuperInterfacesToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesToInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesToInterface.java"); doJavaTest(fileName); } @TestMetadata("moveSuperInterfacesWithGenerics.java") public void testMoveSuperInterfacesWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesWithGenerics.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/j2k/moveSuperInterfacesWithGenerics.java"); doJavaTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pushDown/PushDownTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pushDown/PushDownTestGenerated.java index 6e849897e7e..623257218bc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/pushDown/PushDownTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/pushDown/PushDownTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.pushDown; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,125 +33,125 @@ import java.util.regex.Pattern; public class PushDownTestGenerated extends AbstractPushDownTest { @TestMetadata("accidentalOverrides.kt") public void testAccidentalOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/accidentalOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/accidentalOverrides.kt"); doTest(fileName); } public void testAllFilesPresentInPushDown() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pushDown"), Pattern.compile("^(.+)\\.kt$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/pushDown"), Pattern.compile("^(.+)\\.kt$")); } @TestMetadata("clashingMembers.kt") public void testClashingMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/clashingMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/clashingMembers.kt"); doTest(fileName); } @TestMetadata("classToInterface.kt") public void testClassToInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/classToInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/classToInterface.kt"); doTest(fileName); } @TestMetadata("conflictingSuperCall.kt") public void testConflictingSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/conflictingSuperCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/conflictingSuperCall.kt"); doTest(fileName); } @TestMetadata("finalClass.kt") public void testFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/finalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/finalClass.kt"); doTest(fileName); } @TestMetadata("implicitCompanionUsages.kt") public void testImplicitCompanionUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/implicitCompanionUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/implicitCompanionUsages.kt"); doTest(fileName); } @TestMetadata("kotlinToJava.kt") public void testKotlinToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/kotlinToJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/kotlinToJava.kt"); doTest(fileName); } @TestMetadata("liftPrivate.kt") public void testLiftPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/liftPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/liftPrivate.kt"); doTest(fileName); } @TestMetadata("noCaret.kt") public void testNoCaret() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/noCaret.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/noCaret.kt"); doTest(fileName); } @TestMetadata("objectDeclaration.kt") public void testObjectDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/objectDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/objectDeclaration.kt"); doTest(fileName); } @TestMetadata("outsideOfClass.kt") public void testOutsideOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/outsideOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/outsideOfClass.kt"); doTest(fileName); } @TestMetadata("pushClassMembers.kt") public void testPushClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembers.kt"); doTest(fileName); } @TestMetadata("pushClassMembersAndMakeAbstract.kt") public void testPushClassMembersAndMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembersAndMakeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembersAndMakeAbstract.kt"); doTest(fileName); } @TestMetadata("pushClassMembersWithGenerics.kt") public void testPushClassMembersWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt"); doTest(fileName); } @TestMetadata("pushInterfaceMembers.kt") public void testPushInterfaceMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushInterfaceMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushInterfaceMembers.kt"); doTest(fileName); } @TestMetadata("pushInterfaceMembersAndMakeAbstract.kt") public void testPushInterfaceMembersAndMakeAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushInterfaceMembersAndMakeAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushInterfaceMembersAndMakeAbstract.kt"); doTest(fileName); } @TestMetadata("pushMembersUsingPrivates.kt") public void testPushMembersUsingPrivates() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushMembersUsingPrivates.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushMembersUsingPrivates.kt"); doTest(fileName); } @TestMetadata("pushMembersWithExternalUsages.kt") public void testPushMembersWithExternalUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushMembersWithExternalUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushMembersWithExternalUsages.kt"); doTest(fileName); } @TestMetadata("pushSuperInterfaces.kt") public void testPushSuperInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushSuperInterfaces.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushSuperInterfaces.kt"); doTest(fileName); } @TestMetadata("pushSuperInterfacesWithGenerics.kt") public void testPushSuperInterfacesWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushSuperInterfacesWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pushDown/pushSuperInterfacesWithGenerics.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index 1340f606046..b0a1da67eef 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,450 +32,450 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class RenameTestGenerated extends AbstractRenameTest { public void testAllFilesPresentInRename() throws Exception { - JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$")); + KotlinTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$")); } @TestMetadata("automaticRenamer/simple.test") public void testAutomaticRenamer_Simple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamer/simple.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamer/simple.test"); doTest(fileName); } @TestMetadata("automaticRenamerForJavaClass/javaClass.test") public void testAutomaticRenamerForJavaClass_JavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerForJavaClass/javaClass.test"); doTest(fileName); } @TestMetadata("automaticRenamerJavaParameter/parameter.test") public void testAutomaticRenamerJavaParameter_Parameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerJavaParameter/parameter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerJavaParameter/parameter.test"); doTest(fileName); } @TestMetadata("automaticRenamerOverloads/package.test") public void testAutomaticRenamerOverloads_Package() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloads/package.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloads/package.test"); doTest(fileName); } @TestMetadata("automaticRenamerOverloadsClass/class.test") public void testAutomaticRenamerOverloadsClass_Class() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsClass/class.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsClass/class.test"); doTest(fileName); } @TestMetadata("automaticRenamerOverloadsJavaClass/overloads.test") public void testAutomaticRenamerOverloadsJavaClass_Overloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsJavaClass/overloads.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsJavaClass/overloads.test"); doTest(fileName); } @TestMetadata("automaticRenamerOverloadsObject/object.test") public void testAutomaticRenamerOverloadsObject_Object() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsObject/object.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerOverloadsObject/object.test"); doTest(fileName); } @TestMetadata("automaticRenamerParameter/parameter.test") public void testAutomaticRenamerParameter_Parameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerParameter/parameter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerParameter/parameter.test"); doTest(fileName); } @TestMetadata("automaticRenamerParameterInExtension/parameter.test") public void testAutomaticRenamerParameterInExtension_Parameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerParameterInExtension/parameter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/automaticRenamerParameterInExtension/parameter.test"); doTest(fileName); } @TestMetadata("companionObject/companionObject.test") public void testCompanionObject_CompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObject/companionObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObject/companionObject.test"); doTest(fileName); } @TestMetadata("companionObjectWithDefaultName/companionObject.test") public void testCompanionObjectWithDefaultName_CompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObjectWithDefaultName/companionObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObjectWithDefaultName/companionObject.test"); doTest(fileName); } @TestMetadata("companionObjectWithNameMatchingClass/companionObject.test") public void testCompanionObjectWithNameMatchingClass_CompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObjectWithNameMatchingClass/companionObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/companionObjectWithNameMatchingClass/companionObject.test"); doTest(fileName); } @TestMetadata("renameArgumentsWhenParameterRenamed/parameter.test") public void testRenameArgumentsWhenParameterRenamed_Parameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameArgumentsWhenParameterRenamed/parameter.test"); doTest(fileName); } @TestMetadata("renameBundle/renameBundle.test") public void testRenameBundle_RenameBundle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameBundle/renameBundle.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameBundle/renameBundle.test"); doTest(fileName); } @TestMetadata("renameBundleProperty/renameBundleProperty.test") public void testRenameBundleProperty_RenameBundleProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameBundleProperty/renameBundleProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameBundleProperty/renameBundleProperty.test"); doTest(fileName); } @TestMetadata("renameCompareTo/compareTo.test") public void testRenameCompareTo_CompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameCompareTo/compareTo.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameCompareTo/compareTo.test"); doTest(fileName); } @TestMetadata("renameContains/contains.test") public void testRenameContains_Contains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContains/contains.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContains/contains.test"); doTest(fileName); } @TestMetadata("renameContainsWithConflicts/containsWithConflicts.test") public void testRenameContainsWithConflicts_ContainsWithConflicts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContainsWithConflicts/containsWithConflicts.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContainsWithConflicts/containsWithConflicts.test"); doTest(fileName); } @TestMetadata("renameEmptyKotlinFile/renameFile.test") public void testRenameEmptyKotlinFile_RenameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameEmptyKotlinFile/renameFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameEmptyKotlinFile/renameFile.test"); doTest(fileName); } @TestMetadata("renameEquals/equals.test") public void testRenameEquals_Equals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameEquals/equals.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameEquals/equals.test"); doTest(fileName); } @TestMetadata("renameExplicitComponentFunction/explicitComponentFunction.test") public void testRenameExplicitComponentFunction_ExplicitComponentFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameExplicitComponentFunction/explicitComponentFunction.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameExplicitComponentFunction/explicitComponentFunction.test"); doTest(fileName); } @TestMetadata("renameFieldIdentifier/fieldIdentifier.test") public void testRenameFieldIdentifier_FieldIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameFieldIdentifier/fieldIdentifier.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameFieldIdentifier/fieldIdentifier.test"); doTest(fileName); } @TestMetadata("renameGet/get.test") public void testRenameGet_Get() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameGet/get.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameGet/get.test"); doTest(fileName); } @TestMetadata("renameInc/inc.test") public void testRenameInc_Inc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInc/inc.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInc/inc.test"); doTest(fileName); } @TestMetadata("renameInvoke/invoke.test") public void testRenameInvoke_Invoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInvoke/invoke.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInvoke/invoke.test"); doTest(fileName); } @TestMetadata("renameIterator/iterator.test") public void testRenameIterator_Iterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameIterator/iterator.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameIterator/iterator.test"); doTest(fileName); } @TestMetadata("renameJavaClass/renameJavaClass.test") public void testRenameJavaClass_RenameJavaClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test"); doTest(fileName); } @TestMetadata("renameJavaInterface/renameJavaInterface.test") public void testRenameJavaInterface_RenameJavaInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test"); doTest(fileName); } @TestMetadata("renameJavaMethod/javaBaseMethod.test") public void testRenameJavaMethod_JavaBaseMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/javaBaseMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/javaBaseMethod.test"); doTest(fileName); } @TestMetadata("renameJavaMethod/kotlinOverridenMethod.test") public void testRenameJavaMethod_KotlinOverridenMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/kotlinOverridenMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/kotlinOverridenMethod.test"); doTest(fileName); } @TestMetadata("renameKotlinBaseMethod/javaWrapperForBaseFunction.test") public void testRenameKotlinBaseMethod_JavaWrapperForBaseFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test"); doTest(fileName); } @TestMetadata("renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test") public void testRenameKotlinBaseMethod_JavaWrapperForOverridenFunctionWithKotlinBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test"); doTest(fileName); } @TestMetadata("renameKotlinBaseMethod/kotlinBaseFunction.test") public void testRenameKotlinBaseMethod_KotlinBaseFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/kotlinBaseFunction.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/kotlinBaseFunction.test"); doTest(fileName); } @TestMetadata("renameKotlinClass/javaWrapperForKotlinClass.test") public void testRenameKotlinClass_JavaWrapperForKotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/javaWrapperForKotlinClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/javaWrapperForKotlinClass.test"); doTest(fileName); } @TestMetadata("renameKotlinClass/kotlinClass.test") public void testRenameKotlinClass_KotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/kotlinClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/kotlinClass.test"); doTest(fileName); } @TestMetadata("renameKotlinClassByConstructorRef/kotlinClass.test") public void testRenameKotlinClassByConstructorRef_KotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassByConstructorRef/kotlinClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassByConstructorRef/kotlinClass.test"); doTest(fileName); } @TestMetadata("renameKotlinClassConstructor/renameKotlinConstructor.test") public void testRenameKotlinClassConstructor_RenameKotlinConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassConstructor/renameKotlinConstructor.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassConstructor/renameKotlinConstructor.test"); doTest(fileName); } @TestMetadata("renameKotlinClassSecondaryConstructor/renameKotlinSecondaryConstructor.test") public void testRenameKotlinClassSecondaryConstructor_RenameKotlinSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassSecondaryConstructor/renameKotlinSecondaryConstructor.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassSecondaryConstructor/renameKotlinSecondaryConstructor.test"); doTest(fileName); } @TestMetadata("renameKotlinClassWithFile/javaClassWrapper.test") public void testRenameKotlinClassWithFile_JavaClassWrapper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/javaClassWrapper.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/javaClassWrapper.test"); doTest(fileName); } @TestMetadata("renameKotlinClassWithFile/kotlinClass.test") public void testRenameKotlinClassWithFile_KotlinClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/kotlinClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/kotlinClass.test"); doTest(fileName); } @TestMetadata("renameKotlinEnum/renameKotlinEnum.test") public void testRenameKotlinEnum_RenameKotlinEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinEnum/renameKotlinEnum.test"); doTest(fileName); } @TestMetadata("renameKotlinEnumEntry/renameKotlinEnumEntry.test") public void testRenameKotlinEnumEntry_RenameKotlinEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinEnumEntry/renameKotlinEnumEntry.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinEnumEntry/renameKotlinEnumEntry.test"); doTest(fileName); } @TestMetadata("renameKotlinFile/renameFile.test") public void testRenameKotlinFile_RenameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFile/renameFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFile/renameFile.test"); doTest(fileName); } @TestMetadata("renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test") public void testRenameKotlinFunctionInEnum_RenameKotlinFunctionInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnum.test"); doTest(fileName); } @TestMetadata("renameKotlinFunctionInEnum/renameKotlinFunctionInEnumFromSubclass.test") public void testRenameKotlinFunctionInEnum_RenameKotlinFunctionInEnumFromSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnumFromSubclass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnumFromSubclass.test"); doTest(fileName); } @TestMetadata("renameKotlinMethod/javaWrapperForKotlinMethod.test") public void testRenameKotlinMethod_JavaWrapperForKotlinMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test"); doTest(fileName); } @TestMetadata("renameKotlinMethod/renameKotlinMethod.test") public void testRenameKotlinMethod_RenameKotlinMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/renameKotlinMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/renameKotlinMethod.test"); doTest(fileName); } @TestMetadata("renameKotlinMethodWithEscapedName/renameKotlinMethodWithEscapedName.test") public void testRenameKotlinMethodWithEscapedName_RenameKotlinMethodWithEscapedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethodWithEscapedName/renameKotlinMethodWithEscapedName.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethodWithEscapedName/renameKotlinMethodWithEscapedName.test"); doTest(fileName); } @TestMetadata("renameKotlinPackage/renameInOtherFile.test") public void testRenameKotlinPackage_RenameInOtherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameInOtherFile.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameInOtherFile.test"); doTest(fileName); } @TestMetadata("renameKotlinPackage/renameKotlinPackage.test") public void testRenameKotlinPackage_RenameKotlinPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameKotlinPackage.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameKotlinPackage.test"); doTest(fileName); } @TestMetadata("renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test") public void testRenameKotlinPackageClass_JavaWrapperForKotlinPackageClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test"); doTest(fileName); } @TestMetadata("renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test") public void testRenameKotlinPackageFunctionFromJava_RenameKotlinPackageFunctionFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test"); doTest(fileName); } @TestMetadata("renameKotlinPackageFunctionFromJavaNewFacade/renameKotlinPackageFunctionFromJava.test") public void testRenameKotlinPackageFunctionFromJavaNewFacade_RenameKotlinPackageFunctionFromJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJavaNewFacade/renameKotlinPackageFunctionFromJava.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJavaNewFacade/renameKotlinPackageFunctionFromJava.test"); doTest(fileName); } @TestMetadata("renameKotlinPrimaryConstructorProperty/renameKotlinPrimaryConstructorProperty.test") public void testRenameKotlinPrimaryConstructorProperty_RenameKotlinPrimaryConstructorProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPrimaryConstructorProperty/renameKotlinPrimaryConstructorProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPrimaryConstructorProperty/renameKotlinPrimaryConstructorProperty.test"); doTest(fileName); } @TestMetadata("renameKotlinPrimaryConstructorPropertyFromOverride/renameKotlinPrimaryConstructorPropertyFromOverride.test") public void testRenameKotlinPrimaryConstructorPropertyFromOverride_RenameKotlinPrimaryConstructorPropertyFromOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPrimaryConstructorPropertyFromOverride/renameKotlinPrimaryConstructorPropertyFromOverride.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPrimaryConstructorPropertyFromOverride/renameKotlinPrimaryConstructorPropertyFromOverride.test"); doTest(fileName); } @TestMetadata("renameKotlinStaticMethod/renameKotlinStaticMethod.test") public void testRenameKotlinStaticMethod_RenameKotlinStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinStaticMethod/renameKotlinStaticMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinStaticMethod/renameKotlinStaticMethod.test"); doTest(fileName); } @TestMetadata("renameKotlinTopLevelVarProperty/renameTopLevelVarProperty.test") public void testRenameKotlinTopLevelVarProperty_RenameTopLevelVarProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/renameTopLevelVarProperty.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinTopLevelVarProperty/renameTopLevelVarProperty.test"); doTest(fileName); } @TestMetadata("renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test") public void testRenameKotlinValProperty_RenameAsJavaGetterForExplicitGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test"); doTest(fileName); } @TestMetadata("renameKotlinValProperty/renameBase.test") public void testRenameKotlinValProperty_RenameBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameBase.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameBase.test"); doTest(fileName); } @TestMetadata("renameKotlinValProperty/renameOverriden.test") public void testRenameKotlinValProperty_RenameOverriden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameOverriden.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameOverriden.test"); doTest(fileName); } @TestMetadata("renameKotlinValPropertyInCompanionObject/renameKotlinValPropertyInCompanionObject.test") public void testRenameKotlinValPropertyInCompanionObject_RenameKotlinValPropertyInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValPropertyInCompanionObject/renameKotlinValPropertyInCompanionObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValPropertyInCompanionObject/renameKotlinValPropertyInCompanionObject.test"); doTest(fileName); } @TestMetadata("renameKotlinValPropertyInObject/renameKotlinValPropertyInObject.test") public void testRenameKotlinValPropertyInObject_RenameKotlinValPropertyInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValPropertyInObject/renameKotlinValPropertyInObject.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValPropertyInObject/renameKotlinValPropertyInObject.test"); doTest(fileName); } @TestMetadata("renameKotlinVarProperty/renameAsJavaGetter.test") public void testRenameKotlinVarProperty_RenameAsJavaGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaGetter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaGetter.test"); doTest(fileName); } @TestMetadata("renameKotlinVarProperty/renameAsJavaSetter.test") public void testRenameKotlinVarProperty_RenameAsJavaSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaSetter.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaSetter.test"); doTest(fileName); } @TestMetadata("renameKotlinVarProperty/renameBase.test") public void testRenameKotlinVarProperty_RenameBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameBase.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameBase.test"); doTest(fileName); } @TestMetadata("renameKotlinVarProperty/renameOverriden.test") public void testRenameKotlinVarProperty_RenameOverriden() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameOverriden.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameOverriden.test"); doTest(fileName); } @TestMetadata("renamePlus/plus.test") public void testRenamePlus_Plus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlus/plus.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlus/plus.test"); doTest(fileName); } @TestMetadata("renamePlusAssign/plusAssign.test") public void testRenamePlusAssign_PlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlusAssign/plusAssign.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlusAssign/plusAssign.test"); doTest(fileName); } @TestMetadata("renameSet/set.test") public void testRenameSet_Set() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSet/set.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSet/set.test"); doTest(fileName); } @TestMetadata("renameSynthesizedComponentFunction/synthesizedComponentFunction.test") public void testRenameSynthesizedComponentFunction_SynthesizedComponentFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSynthesizedComponentFunction/synthesizedComponentFunction.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSynthesizedComponentFunction/synthesizedComponentFunction.test"); doTest(fileName); } @TestMetadata("renameUnaryMinus/unaryMinus.test") public void testRenameUnaryMinus_UnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameUnaryMinus/unaryMinus.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameUnaryMinus/unaryMinus.test"); doTest(fileName); } @TestMetadata("syntheticPropertyUsages1/renameGetMethod.test") public void testSyntheticPropertyUsages1_RenameGetMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages1/renameGetMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages1/renameGetMethod.test"); doTest(fileName); } @TestMetadata("syntheticPropertyUsages2/renameSetMethod.test") public void testSyntheticPropertyUsages2_RenameSetMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages2/renameSetMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages2/renameSetMethod.test"); doTest(fileName); } @TestMetadata("syntheticPropertyUsages3/renameSetMethod.test") public void testSyntheticPropertyUsages3_RenameSetMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages3/renameSetMethod.test"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/syntheticPropertyUsages3/renameSetMethod.test"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index c381ca573fe..f7ceeb5df97 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.util.ArrayList; import java.util.Collection; @@ -37,12 +37,12 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase { @Override protected void setUp() throws Exception { super.setUp(); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); } @Override protected void tearDown() throws Exception { - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); super.tearDown(); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt index d258702c351..c9d5af634a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.HashSet -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import org.jetbrains.kotlin.psi.KtBlockExpression import org.junit.Assert @@ -45,20 +45,20 @@ import org.jetbrains.kotlin.idea.KotlinFileType import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = JetTestUtils.getHomeDirectory() - override fun getProjectDescriptor() = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE +public abstract class AbstractPartialBodyResolveTest : KotlinLightCodeInsightFixtureTestCase() { + override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE public fun doTest(testPath: String) { val dumpNormal = dump(testPath, BodyResolveMode.PARTIAL) val testPathNoExt = FileUtil.getNameWithoutExtension(testPath) - JetTestUtils.assertEqualsToFile(File(testPathNoExt + ".dump"), dumpNormal) + KotlinTestUtils.assertEqualsToFile(File(testPathNoExt + ".dump"), dumpNormal) val dumpForCompletion = dump(testPath, BodyResolveMode.PARTIAL_FOR_COMPLETION) val completionDump = File(testPathNoExt + ".completion") if (dumpForCompletion != dumpNormal) { - JetTestUtils.assertEqualsToFile(completionDump, dumpForCompletion) + KotlinTestUtils.assertEqualsToFile(completionDump, dumpForCompletion) } else { Assert.assertFalse(completionDump.exists()) diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index a4d38ec7450..a6ca6b88a60 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.junit.Assert import junit.framework.AssertionFailedError -public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractReferenceResolveInLibrarySourcesTest : KotlinLightCodeInsightFixtureTestCase() { companion object { private val REF_CARET_MARKER = "" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt index 59a08995485..3b9c574ecaa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiReference import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.UsefulTestCase import com.intellij.util.PathUtil -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightPlatformCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils @@ -93,7 +93,7 @@ public abstract class AbstractReferenceResolveTest : KotlinLightPlatformCodeInsi } } - override fun getProjectDescriptor(): LightProjectDescriptor? = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor(): LightProjectDescriptor? = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE override fun getTestDataPath() = "./" diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java index a0a08e82022..0e392933999 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,438 +32,438 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class PartialBodyResolveTestGenerated extends AbstractPartialBodyResolveTest { public void testAllFilesPresentInPartialBodyResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/partialBodyResolve"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/partialBodyResolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/AnonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/AnonymousObjects.kt"); doTest(fileName); } @TestMetadata("As.kt") public void testAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/As.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/As.kt"); doTest(fileName); } @TestMetadata("BangBang.kt") public void testBangBang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBang.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBang.kt"); doTest(fileName); } @TestMetadata("BangBangHasPlatformTypeBug.kt") public void testBangBangHasPlatformTypeBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBangHasPlatformTypeBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBangHasPlatformTypeBug.kt"); doTest(fileName); } @TestMetadata("BangBangInIfCondition.kt") public void testBangBangInIfCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/BangBangInIfCondition.kt"); doTest(fileName); } @TestMetadata("ClassInitializerHasNoValue.kt") public void testClassInitializerHasNoValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ClassInitializerHasNoValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ClassInitializerHasNoValue.kt"); doTest(fileName); } @TestMetadata("DeclarationsBefore.kt") public void testDeclarationsBefore() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/DeclarationsBefore.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/DeclarationsBefore.kt"); doTest(fileName); } @TestMetadata("DoWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/DoWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/DoWhile.kt"); doTest(fileName); } @TestMetadata("Elvis.kt") public void testElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Elvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Elvis.kt"); doTest(fileName); } @TestMetadata("ElvisReturn.kt") public void testElvisReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ElvisReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ElvisReturn.kt"); doTest(fileName); } @TestMetadata("ExpressionBodyExplicitType.kt") public void testExpressionBodyExplicitType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ExpressionBodyExplicitType.kt"); doTest(fileName); } @TestMetadata("For1.kt") public void testFor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/For1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/For1.kt"); doTest(fileName); } @TestMetadata("For2.kt") public void testFor2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/For2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/For2.kt"); doTest(fileName); } @TestMetadata("IfBranchesAutoCasts.kt") public void testIfBranchesAutoCasts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts.kt"); doTest(fileName); } @TestMetadata("IfBranchesAutoCasts2.kt") public void testIfBranchesAutoCasts2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesAutoCasts2.kt"); doTest(fileName); } @TestMetadata("IfBranchesSmartCast.kt") public void testIfBranchesSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfBranchesSmartCast.kt"); doTest(fileName); } @TestMetadata("IfCallWithConditionReturn.kt") public void testIfCallWithConditionReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfCallWithConditionReturn.kt"); doTest(fileName); } @TestMetadata("IfEqAutoCast.kt") public void testIfEqAutoCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfEqAutoCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfEqAutoCast.kt"); doTest(fileName); } @TestMetadata("IfIsReturn.kt") public void testIfIsReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfIsReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfIsReturn.kt"); doTest(fileName); } @TestMetadata("IfNegatedNotNullReturn.kt") public void testIfNegatedNotNullReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNegatedNotNullReturn.kt"); doTest(fileName); } @TestMetadata("IfNotIsError.kt") public void testIfNotIsError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsError.kt"); doTest(fileName); } @TestMetadata("IfNotIsErrorQualifier.kt") public void testIfNotIsErrorQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt"); doTest(fileName); } @TestMetadata("IfNotIsErrorVariable.kt") public void testIfNotIsErrorVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsErrorVariable.kt"); doTest(fileName); } @TestMetadata("IfNotIsMyError.kt") public void testIfNotIsMyError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt"); doTest(fileName); } @TestMetadata("IfNotIsMyErrorWithAliasImport.kt") public void testIfNotIsMyErrorWithAliasImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsMyErrorWithAliasImport.kt"); doTest(fileName); } @TestMetadata("IfNotIsNothingProp.kt") public void testIfNotIsNothingProp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt"); doTest(fileName); } @TestMetadata("IfNotIsReturn.kt") public void testIfNotIsReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt"); doTest(fileName); } @TestMetadata("IfNotIsReturn2.kt") public void testIfNotIsReturn2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt"); doTest(fileName); } @TestMetadata("IfNotIsThrow.kt") public void testIfNotIsThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt"); doTest(fileName); } @TestMetadata("IfNotNullElseReturn.kt") public void testIfNotNullElseReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNotNullElseReturn.kt"); doTest(fileName); } @TestMetadata("IfNullAlwaysExits.kt") public void testIfNullAlwaysExits() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullAlwaysExits.kt"); doTest(fileName); } @TestMetadata("IfNullAndNullReturn.kt") public void testIfNullAndNullReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullAndNullReturn.kt"); doTest(fileName); } @TestMetadata("IfNullBreak.kt") public void testIfNullBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullBreak.kt"); doTest(fileName); } @TestMetadata("IfNullConditionalReturn.kt") public void testIfNullConditionalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullConditionalReturn.kt"); doTest(fileName); } @TestMetadata("IfNullConditionalReturnWithElse.kt") public void testIfNullConditionalReturnWithElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullConditionalReturnWithElse.kt"); doTest(fileName); } @TestMetadata("IfNullContinue.kt") public void testIfNullContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullContinue.kt"); doTest(fileName); } @TestMetadata("IfNullDoWhileWithBreak.kt") public void testIfNullDoWhileWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullDoWhileWithBreak.kt"); doTest(fileName); } @TestMetadata("IfNullElseReturn.kt") public void testIfNullElseReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElseReturn.kt"); doTest(fileName); } @TestMetadata("IfNullElvisReturn.kt") public void testIfNullElvisReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullElvisReturn.kt"); doTest(fileName); } @TestMetadata("IfNullForWithReturn.kt") public void testIfNullForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullForWithReturn.kt"); doTest(fileName); } @TestMetadata("IfNullOrNullReturn.kt") public void testIfNullOrNullReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullOrNullReturn.kt"); doTest(fileName); } @TestMetadata("IfNullPrint.kt") public void testIfNullPrint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullPrint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullPrint.kt"); doTest(fileName); } @TestMetadata("IfNullReturn.kt") public void testIfNullReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullReturn.kt"); doTest(fileName); } @TestMetadata("IfNullWhileTrueWithBreak.kt") public void testIfNullWhileTrueWithBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullWhileTrueWithBreak.kt"); doTest(fileName); } @TestMetadata("IfNullWhileWithReturn.kt") public void testIfNullWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfNullWhileWithReturn.kt"); doTest(fileName); } @TestMetadata("IfReturn.kt") public void testIfReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IfReturn.kt"); doTest(fileName); } @TestMetadata("InIfExpressionElse.kt") public void testInIfExpressionElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/InIfExpressionElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/InIfExpressionElse.kt"); doTest(fileName); } @TestMetadata("IntConstantTypeBug.kt") public void testIntConstantTypeBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IntConstantTypeBug.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/IntConstantTypeBug.kt"); doTest(fileName); } @TestMetadata("LabeledBreak.kt") public void testLabeledBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LabeledBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LabeledBreak.kt"); doTest(fileName); } @TestMetadata("LabeledContinue.kt") public void testLabeledContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LabeledContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LabeledContinue.kt"); doTest(fileName); } @TestMetadata("Lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Lambda.kt"); doTest(fileName); } @TestMetadata("LambdaInCurrentStatement.kt") public void testLambdaInCurrentStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.kt"); doTest(fileName); } @TestMetadata("LambdaReturnsNothing2.kt") public void testLambdaReturnsNothing2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt"); doTest(fileName); } @TestMetadata("LocalClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalClass.kt"); doTest(fileName); } @TestMetadata("LocalFun.kt") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalFun.kt"); doTest(fileName); } @TestMetadata("LocalNothingFun.kt") public void testLocalNothingFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt"); doTest(fileName); } @TestMetadata("MutliDeclaration.kt") public void testMutliDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/MutliDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/MutliDeclaration.kt"); doTest(fileName); } @TestMetadata("NestedLoop.kt") public void testNestedLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/NestedLoop.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/NestedLoop.kt"); doTest(fileName); } @TestMetadata("OutOfBodyResolve.kt") public void testOutOfBodyResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/OutOfBodyResolve.kt"); doTest(fileName); } @TestMetadata("PropertyAccessorBody.kt") public void testPropertyAccessorBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/PropertyAccessorBody.kt"); doTest(fileName); } @TestMetadata("PropertyByDelegate.kt") public void testPropertyByDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/PropertyByDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/PropertyByDelegate.kt"); doTest(fileName); } @TestMetadata("ReturnLambda.kt") public void testReturnLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ReturnLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ReturnLambda.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/Simple.kt"); doTest(fileName); } @TestMetadata("SmartCastInTheSameStatement.kt") public void testSmartCastInTheSameStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastInTheSameStatement.kt"); doTest(fileName); } @TestMetadata("SmartCastOfThis1.kt") public void testSmartCastOfThis1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastOfThis1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastOfThis1.kt"); doTest(fileName); } @TestMetadata("SmartCastOfThis2.kt") public void testSmartCastOfThis2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastOfThis2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastOfThis2.kt"); doTest(fileName); } @TestMetadata("SmartCastPointsResolveRequired1.kt") public void testSmartCastPointsResolveRequired1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired1.kt"); doTest(fileName); } @TestMetadata("SmartCastPointsResolveRequired2.kt") public void testSmartCastPointsResolveRequired2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/SmartCastPointsResolveRequired2.kt"); doTest(fileName); } @TestMetadata("ThisQualifiedAutoCast.kt") public void testThisQualifiedAutoCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt"); doTest(fileName); } @TestMetadata("While.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/While.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/While.kt"); doTest(fileName); } @TestMetadata("WhileTrue.kt") public void testWhileTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/WhileTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/WhileTrue.kt"); doTest(fileName); } @TestMetadata("WhileTrueCondition.kt") public void testWhileTrueCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/WhileTrueCondition.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/partialBodyResolve/WhileTrueCondition.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java index 95f5bb38e42..99b3faba9a5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,90 +32,90 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReferenceResolveInJavaTestGenerated extends AbstractReferenceResolveInJavaTest { public void testAllFilesPresentInReferenceInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInJava"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInJava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotationParameterReference.java") public void testAnnotationParameterReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/AnnotationParameterReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/AnnotationParameterReference.java"); doTest(fileName); } @TestMetadata("AutoGeneratedOverloads.java") public void testAutoGeneratedOverloads() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java"); doTest(fileName); } @TestMetadata("Class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Class.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Class.java"); doTest(fileName); } @TestMetadata("ClassObjectField.java") public void testClassObjectField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ClassObjectField.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ClassObjectField.java"); doTest(fileName); } @TestMetadata("ClassObjectStaticField.java") public void testClassObjectStaticField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ClassObjectStaticField.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ClassObjectStaticField.java"); doTest(fileName); } @TestMetadata("Constructor.java") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Constructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Constructor.java"); doTest(fileName); } @TestMetadata("DelegatedMethodFromTraitNoImpl.java") public void testDelegatedMethodFromTraitNoImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/DelegatedMethodFromTraitNoImpl.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/DelegatedMethodFromTraitNoImpl.java"); doTest(fileName); } @TestMetadata("DelegatedMethodFromTraitWithImpl.java") public void testDelegatedMethodFromTraitWithImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/DelegatedMethodFromTraitWithImpl.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/DelegatedMethodFromTraitWithImpl.java"); doTest(fileName); } @TestMetadata("EnumEntry.java") public void testEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/EnumEntry.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/EnumEntry.java"); doTest(fileName); } @TestMetadata("FileFacade.java") public void testFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/FileFacade.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/FileFacade.java"); doTest(fileName); } @TestMetadata("Getter.java") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Getter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Getter.java"); doTest(fileName); } @TestMetadata("Method.java") public void testMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Method.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/Method.java"); doTest(fileName); } @TestMetadata("ObjectInstance.java") public void testObjectInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ObjectInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/ObjectInstance.java"); doTest(fileName); } @TestMetadata("PlatformStaticFun.java") public void testPlatformStaticFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/PlatformStaticFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInJava/PlatformStaticFun.java"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index ddd991db521..94c3b626569 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,30 +32,30 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReferenceResolveInLibrarySourcesTestGenerated extends AbstractReferenceResolveInLibrarySourcesTest { public void testAllFilesPresentInReferenceInLib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInLib"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInLib"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("builtInNumber.kt") public void testBuiltInNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/builtInNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/builtInNumber.kt"); doTest(fileName); } @TestMetadata("inLibrarySource.kt") public void testInLibrarySource() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/inLibrarySource.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/inLibrarySource.kt"); doTest(fileName); } @TestMetadata("toFunParameter.kt") public void testToFunParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/toFunParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/toFunParameter.kt"); doTest(fileName); } @TestMetadata("toLocalFun.kt") public void testToLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/toLocalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/toLocalFun.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java index bac26bca246..8cd9bf97025 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,402 +32,402 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest { public void testAllFilesPresentInReferences() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("AnnotationForClass.kt") public void testAnnotationForClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationForClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationForClass.kt"); doTest(fileName); } @TestMetadata("AnnotationInsideFunction.kt") public void testAnnotationInsideFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationInsideFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationInsideFunction.kt"); doTest(fileName); } @TestMetadata("AnnotationOnFile.kt") public void testAnnotationOnFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationOnFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationOnFile.kt"); doTest(fileName); } @TestMetadata("AnnotationOnFileWithImport.kt") public void testAnnotationOnFileWithImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationOnFileWithImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationOnFileWithImport.kt"); doTest(fileName); } @TestMetadata("AnnotationParameter.kt") public void testAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationParameter.kt"); doTest(fileName); } @TestMetadata("AnnotationTypeParameter.kt") public void testAnnotationTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationTypeParameter.kt"); doTest(fileName); } @TestMetadata("ClassInTypeConstraint.kt") public void testClassInTypeConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassInTypeConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassInTypeConstraint.kt"); doTest(fileName); } @TestMetadata("ClassNameBeforeDot.kt") public void testClassNameBeforeDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassNameBeforeDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassNameBeforeDot.kt"); doTest(fileName); } @TestMetadata("ClassObjectClassLiteralReference.kt") public void testClassObjectClassLiteralReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassObjectClassLiteralReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassObjectClassLiteralReference.kt"); doTest(fileName); } @TestMetadata("ClassObjectClassLiteralReferenceWithField.kt") public void testClassObjectClassLiteralReferenceWithField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassObjectClassLiteralReferenceWithField.kt"); doTest(fileName); } @TestMetadata("ClassQualifierForNestedClassConstructorCall.kt") public void testClassQualifierForNestedClassConstructorCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassQualifierForNestedClassConstructorCall.kt"); doTest(fileName); } @TestMetadata("ClassReferenceInImport.kt") public void testClassReferenceInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassReferenceInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ClassReferenceInImport.kt"); doTest(fileName); } @TestMetadata("CtrlClickResolve.kt") public void testCtrlClickResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/CtrlClickResolve.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/CtrlClickResolve.kt"); doTest(fileName); } @TestMetadata("DataClassCopy.kt") public void testDataClassCopy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DataClassCopy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DataClassCopy.kt"); doTest(fileName); } @TestMetadata("DefaultObjectAsExtensionReceiverForFunction.kt") public void testDefaultObjectAsExtensionReceiverForFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForFunction.kt"); doTest(fileName); } @TestMetadata("DefaultObjectAsExtensionReceiverForProperty.kt") public void testDefaultObjectAsExtensionReceiverForProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsExtensionReceiverForProperty.kt"); doTest(fileName); } @TestMetadata("DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt") public void testDefaultObjectAsReceiverForExtensionFunctionOnSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsReceiverForExtensionFunctionOnSuperType.kt"); doTest(fileName); } @TestMetadata("DefaultObjectAsReceiverForMemberPropertyInSuperType.kt") public void testDefaultObjectAsReceiverForMemberPropertyInSuperType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectAsReceiverForMemberPropertyInSuperType.kt"); doTest(fileName); } @TestMetadata("DefaultObjectInShortReferenceFormCall.kt") public void testDefaultObjectInShortReferenceFormCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/DefaultObjectInShortReferenceFormCall.kt"); doTest(fileName); } @TestMetadata("EnumValues.kt") public void testEnumValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/EnumValues.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/EnumValues.kt"); doTest(fileName); } @TestMetadata("FakeJavaLang1.kt") public void testFakeJavaLang1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang1.kt"); doTest(fileName); } @TestMetadata("FakeJavaLang2.kt") public void testFakeJavaLang2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang2.kt"); doTest(fileName); } @TestMetadata("FakeJavaLang3.kt") public void testFakeJavaLang3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang3.kt"); doTest(fileName); } @TestMetadata("FakeJavaLang4.kt") public void testFakeJavaLang4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang4.kt"); doTest(fileName); } @TestMetadata("GenericFunctionParameter.kt") public void testGenericFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/GenericFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/GenericFunctionParameter.kt"); doTest(fileName); } @TestMetadata("GenericTypeInFunctionParameter.kt") public void testGenericTypeInFunctionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/GenericTypeInFunctionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/GenericTypeInFunctionParameter.kt"); doTest(fileName); } @TestMetadata("ImportFromRootScope.kt") public void testImportFromRootScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ImportFromRootScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ImportFromRootScope.kt"); doTest(fileName); } @TestMetadata("InClassParameter.kt") public void testInClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameter.kt"); doTest(fileName); } @TestMetadata("InClassParameterField.kt") public void testInClassParameterField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameterField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameterField.kt"); doTest(fileName); } @TestMetadata("InEnumEntry.kt") public void testInEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InEnumEntry.kt"); doTest(fileName); } @TestMetadata("InFunctionParameterType.kt") public void testInFunctionParameterType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InFunctionParameterType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InFunctionParameterType.kt"); doTest(fileName); } @TestMetadata("InMethodParameter.kt") public void testInMethodParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InMethodParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InMethodParameter.kt"); doTest(fileName); } @TestMetadata("InObjectClassObject.kt") public void testInObjectClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InObjectClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InObjectClassObject.kt"); doTest(fileName); } @TestMetadata("InSecondClassObject.kt") public void testInSecondClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InSecondClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/InSecondClassObject.kt"); doTest(fileName); } @TestMetadata("JavaAnnotationParameter.kt") public void testJavaAnnotationParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaAnnotationParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/JavaAnnotationParameter.kt"); doTest(fileName); } @TestMetadata("JavaEnumEntry.kt") public void testJavaEnumEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaEnumEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/JavaEnumEntry.kt"); doTest(fileName); } @TestMetadata("JavaEnumValueOf.kt") public void testJavaEnumValueOf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaEnumValueOf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/JavaEnumValueOf.kt"); doTest(fileName); } @TestMetadata("JavaParameter.kt") public void testJavaParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/JavaParameter.kt"); doTest(fileName); } @TestMetadata("JavaReference.kt") public void testJavaReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/JavaReference.kt"); doTest(fileName); } @TestMetadata("MultiDeclarationExtension.kt") public void testMultiDeclarationExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationExtension.kt"); doTest(fileName); } @TestMetadata("MultiDeclarationMember.kt") public void testMultiDeclarationMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationMember.kt"); doTest(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/NamedClassObject.kt"); doTest(fileName); } @TestMetadata("PackageReference.kt") public void testPackageReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReference.kt"); doTest(fileName); } @TestMetadata("PackageReferenceInImport.kt") public void testPackageReferenceInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReferenceInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReferenceInImport.kt"); doTest(fileName); } @TestMetadata("PropertyPlaceInClassObjectInObject.kt") public void testPropertyPlaceInClassObjectInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt"); doTest(fileName); } @TestMetadata("ReferenceInClassWhereConstraint.kt") public void testReferenceInClassWhereConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInClassWhereConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInClassWhereConstraint.kt"); doTest(fileName); } @TestMetadata("ReferenceInFunWhereConstraint.kt") public void testReferenceInFunWhereConstraint() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInFunWhereConstraint.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInFunWhereConstraint.kt"); doTest(fileName); } @TestMetadata("ReferenceToSam.kt") public void testReferenceToSam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceToSam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceToSam.kt"); doTest(fileName); } @TestMetadata("ResolveClass.kt") public void testResolveClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ResolveClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ResolveClass.kt"); doTest(fileName); } @TestMetadata("ResolvePackageInProperty.kt") public void testResolvePackageInProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ResolvePackageInProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ResolvePackageInProperty.kt"); doTest(fileName); } @TestMetadata("SamAdapter.kt") public void testSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/SamAdapter.kt"); doTest(fileName); } @TestMetadata("SamConstructor.kt") public void testSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructor.kt"); doTest(fileName); } @TestMetadata("SamConstructorTypeArguments.kt") public void testSamConstructorTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructorTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructorTypeArguments.kt"); doTest(fileName); } @TestMetadata("SeveralOverrides.kt") public void testSeveralOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SeveralOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/SeveralOverrides.kt"); doTest(fileName); } @TestMetadata("SyntheticProperty.kt") public void testSyntheticProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SyntheticProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/SyntheticProperty.kt"); doTest(fileName); } @TestMetadata("TypeArgumentBeforeDot.kt") public void testTypeArgumentBeforeDot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentBeforeDot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentBeforeDot.kt"); doTest(fileName); } @TestMetadata("TypeArgumentBeforeDot2.kt") public void testTypeArgumentBeforeDot2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentBeforeDot2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentBeforeDot2.kt"); doTest(fileName); } @TestMetadata("TypeArgumentUnresolvedClass.kt") public void testTypeArgumentUnresolvedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentUnresolvedClass.kt"); doTest(fileName); } @TestMetadata("TypeArgumentUnresolvedConstructor.kt") public void testTypeArgumentUnresolvedConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentUnresolvedConstructor.kt"); doTest(fileName); } @TestMetadata("TypeArgumentWrongNumber.kt") public void testTypeArgumentWrongNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentWrongNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeArgumentWrongNumber.kt"); doTest(fileName); } @TestMetadata("TypeParameterInAnonymousObject.kt") public void testTypeParameterInAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeParameterInAnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeParameterInAnonymousObject.kt"); doTest(fileName); } @TestMetadata("TypeParameterInFunctionLiteral.kt") public void testTypeParameterInFunctionLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt"); doTest(fileName); } @TestMetadata("ValueParameter.kt") public void testValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/ValueParameter.kt"); doTest(fileName); } @TestMetadata("WrongNumberOfTypeArguments.kt") public void testWrongNumberOfTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArguments.kt"); doTest(fileName); } @TestMetadata("WrongNumberOfTypeArguments2.kt") public void testWrongNumberOfTypeArguments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt"); doTest(fileName); } @TestMetadata("WrongNumberOfTypeArgumentsInSupertype.kt") public void testWrongNumberOfTypeArgumentsInSupertype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArgumentsInSupertype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/WrongNumberOfTypeArgumentsInSupertype.kt"); doTest(fileName); } @@ -436,12 +436,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest { public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("unresolved.kt") public void testUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt"); doTest(fileName); } @@ -450,42 +450,42 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class InSource extends AbstractReferenceResolveTest { public void testAllFilesPresentInInSource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("getExtension.kt") public void testGetExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt"); doTest(fileName); } @TestMetadata("getMember.kt") public void testGetMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt"); doTest(fileName); } @TestMetadata("getMultipleDeclarations.kt") public void testGetMultipleDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt"); doTest(fileName); } @TestMetadata("getOneFakeOverride.kt") public void testGetOneFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt"); doTest(fileName); } @TestMetadata("getSetPropertyDelegatedExtension.kt") public void testGetSetPropertyDelegatedExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt"); doTest(fileName); } @TestMetadata("getSetPropertyDelegatedMember.kt") public void testGetSetPropertyDelegatedMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt"); doTest(fileName); } } @@ -495,18 +495,18 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class InStandardLibrary extends AbstractReferenceResolveTest { public void testAllFilesPresentInInStandardLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("lazy.kt") public void testLazy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt"); doTest(fileName); } @TestMetadata("notNull.kt") public void testNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt"); doTest(fileName); } } @@ -517,12 +517,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class ForLoopIn extends AbstractReferenceResolveTest { public void testAllFilesPresentInForLoopIn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("unresolvedIterator.kt") public void testUnresolvedIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/unresolvedIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/unresolvedIterator.kt"); doTest(fileName); } @@ -531,18 +531,18 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class InBuiltIns extends AbstractReferenceResolveTest { public void testAllFilesPresentInInBuiltIns() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt"); doTest(fileName); } @TestMetadata("member.kt") public void testMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt"); doTest(fileName); } } @@ -552,12 +552,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class InLibrary extends AbstractReferenceResolveTest { public void testAllFilesPresentInInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt"); doTest(fileName); } } @@ -568,23 +568,23 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest public static class InSource extends AbstractReferenceResolveTest { @TestMetadata("allExtensions.kt") public void testAllExtensions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt"); doTest(fileName); } public void testAllFilesPresentInInSource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("allMembers.kt") public void testAllMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt"); doTest(fileName); } @TestMetadata("nextMissing.kt") public void testNextMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt"); doTest(fileName); } } @@ -595,60 +595,60 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractReferenceResolveTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/invoke"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/invoke"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("lambdaAndParens.kt") public void testLambdaAndParens() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaAndParens.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaAndParens.kt"); doTest(fileName); } @TestMetadata("lambdaNoPar.kt") public void testLambdaNoPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoPar.kt"); doTest(fileName); } @TestMetadata("lambdaNoParLabel.kt") public void testLambdaNoParLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParLabel.kt"); doTest(fileName); } @TestMetadata("lambdaNoParRCurly.kt") public void testLambdaNoParRCurly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt"); doTest(fileName); } @TestMetadata("noParams.kt") public void testNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParams.kt"); doTest(fileName); } @TestMetadata("noParamsRPar.kt") public void testNoParamsRPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParamsRPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParamsRPar.kt"); doTest(fileName); } @TestMetadata("nonemptyLambdaRPar.kt") public void testNonemptyLambdaRPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt"); doTest(fileName); } @TestMetadata("oneParam.kt") public void testOneParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParam.kt"); doTest(fileName); } @TestMetadata("oneParamRPar.kt") public void testOneParamRPar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParamRPar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParamRPar.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java index 9a9093192ef..817a25fa1ef 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,72 +32,72 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResolveWithLibTest { public void testAllFilesPresentInReferenceWithLib() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("delegatedPropertyWithTypeParameters.kt") public void testDelegatedPropertyWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt"); doTest(fileName); } @TestMetadata("fakeOverride.kt") public void testFakeOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride.kt"); doTest(fileName); } @TestMetadata("fakeOverride2.kt") public void testFakeOverride2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride2.kt"); doTest(fileName); } @TestMetadata("innerClassFromLib.kt") public void testInnerClassFromLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/innerClassFromLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/innerClassFromLib.kt"); doTest(fileName); } @TestMetadata("iteratorWithTypeParameter.kt") public void testIteratorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/iteratorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/iteratorWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("multiDeclarationWithTypeParameters.kt") public void testMultiDeclarationWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt"); doTest(fileName); } @TestMetadata("nestedClassFromLib.kt") public void testNestedClassFromLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt"); doTest(fileName); } @TestMetadata("packageOfLibDeclaration.kt") public void testPackageOfLibDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/packageOfLibDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/packageOfLibDeclaration.kt"); doTest(fileName); } @TestMetadata("referenceToRootJavaClassFromLib.kt") public void testReferenceToRootJavaClassFromLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/referenceToRootJavaClassFromLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/referenceToRootJavaClassFromLib.kt"); doTest(fileName); } @TestMetadata("sameNameInLib.kt") public void testSameNameInLib() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/sameNameInLib.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/sameNameInLib.kt"); doTest(fileName); } @TestMetadata("setWithTypeParameters.kt") public void testSetWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index 75070a498a9..19d5c21d706 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,18 +32,18 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReferenceToJavaWithWrongFileStructureTestGenerated extends AbstractReferenceToJavaWithWrongFileStructureTest { public void testAllFilesPresentInReferenceToJavaWithWrongFileStructure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceToJavaWithWrongFileStructure"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceToJavaWithWrongFileStructure"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("ClassStatics.kt") public void testClassStatics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/ClassStatics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/ClassStatics.kt"); doTest(fileName); } @TestMetadata("SimpleClass.kt") public void testSimpleClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/SimpleClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/SimpleClass.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt index fbf94b865a9..30f069d1912 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.structureView import org.jetbrains.kotlin.idea.test.PluginTestCaseBase -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import com.intellij.util.ui.tree.TreeUtil import com.intellij.openapi.util.io.FileUtil import java.io.File @@ -25,12 +25,12 @@ 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.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.ui.Queryable.PrintInfo import org.jetbrains.kotlin.test.util.configureWithExtraFile -public abstract class AbstractKotlinFileStructureTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractKotlinFileStructureTest : KotlinLightCodeInsightFixtureTestCase() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/structureView/fileStructure" public fun doTest(path: String) { @@ -49,7 +49,7 @@ public abstract class AbstractKotlinFileStructureTest : JetLightCodeInsightFixtu val printInfo = PrintInfo(arrayOf("text"), arrayOf("location")) val popupText = StructureViewUtil.print(popup.getTree(), false, printInfo, null) - JetTestUtils.assertEqualsToFile(File("${FileUtil.getNameWithoutExtension(path)}.after"), popupText) + KotlinTestUtils.assertEqualsToFile(File("${FileUtil.getNameWithoutExtension(path)}.after"), popupText) } protected fun FileStructurePopup.setup() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java index f2170b8bee8..5873218daf5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.structureView; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,102 +32,102 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class KotlinFileStructureTestGenerated extends AbstractKotlinFileStructureTest { public void testAllFilesPresentInFileStructure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/structureView/fileStructure"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/structureView/fileStructure"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("CheckLocationForKotlin.kt") public void testCheckLocationForKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckLocationForKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckLocationForKotlin.kt"); doTest(fileName); } @TestMetadata("CheckMemberLocationForJava.kt") public void testCheckMemberLocationForJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckMemberLocationForJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckMemberLocationForJava.kt"); doTest(fileName); } @TestMetadata("DoNotShowParentsInLocationJava.kt") public void testDoNotShowParentsInLocationJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/DoNotShowParentsInLocationJava.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/DoNotShowParentsInLocationJava.kt"); doTest(fileName); } @TestMetadata("EmptyFile.kt") public void testEmptyFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/EmptyFile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/EmptyFile.kt"); doTest(fileName); } @TestMetadata("InheritedDelegationMethods.kt") public void testInheritedDelegationMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedDelegationMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedDelegationMethods.kt"); doTest(fileName); } @TestMetadata("InheritedInnerClasses.kt") public void testInheritedInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedInnerClasses.kt"); doTest(fileName); } @TestMetadata("InheritedJavaMembers.kt") public void testInheritedJavaMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedJavaMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedJavaMembers.kt"); doTest(fileName); } @TestMetadata("InheritedLocalKotlin.kt") public void testInheritedLocalKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedLocalKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedLocalKotlin.kt"); doTest(fileName); } @TestMetadata("InheritedMembers.kt") public void testInheritedMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembers.kt"); doTest(fileName); } @TestMetadata("InheritedMembersOfEnum.kt") public void testInheritedMembersOfEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersOfEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersOfEnum.kt"); doTest(fileName); } @TestMetadata("InheritedMembersWithSubstitutedTypes.kt") public void testInheritedMembersWithSubstitutedTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersWithSubstitutedTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersWithSubstitutedTypes.kt"); doTest(fileName); } @TestMetadata("InheritedSAMConversion.kt") public void testInheritedSAMConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSAMConversion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSAMConversion.kt"); doTest(fileName); } @TestMetadata("InheritedSynthesizedFromDataClass.kt") public void testInheritedSynthesizedFromDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSynthesizedFromDataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSynthesizedFromDataClass.kt"); doTest(fileName); } @TestMetadata("Render.kt") public void testRender() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Render.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Render.kt"); doTest(fileName); } @TestMetadata("SeveralClasses.kt") public void testSeveralClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/SeveralClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/SeveralClasses.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Simple.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index 8f5d029a396..75eea8f874b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -41,7 +41,7 @@ public abstract class AbstractResolveByStubTest extends KotlinCodeInsightTestCas private void doTest(@NotNull final String path, final boolean checkPrimaryConstructors, final boolean checkPropertyAccessors) throws Exception { configureByFile(path); - TestUtilsKt.configureAs(getModule(), JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); + TestUtilsKt.configureAs(getModule(), KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); boolean shouldFail = getTestName(false).equals("ClassWithConstVal"); AstAccessControl.INSTANCE$.testWithControlledAccessToAst( shouldFail, getProject(), getTestRootDisposable(), diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java index adc7d580ac7..0b47c1eb5f2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -34,7 +34,7 @@ public abstract class AbstractStubBuilderTest extends LightCodeInsightFixtureTes StubElement lighterTree = jetStubBuilder.buildStubTree(file); String stubTree = serializeStubToString(lighterTree); String expectedFile = sourcePath.replace(".kt", ".expected"); - JetTestUtils.assertEqualsToFile(new File(expectedFile), stubTree); + KotlinTestUtils.assertEqualsToFile(new File(expectedFile), stubTree); } @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java index 7ee6fd0bfc5..4078d35315a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,36 +32,36 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class MultiFileHighlightingTestGenerated extends AbstractMultiFileHighlightingTest { public void testAllFilesPresentInMultiFileHighlighting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiFileHighlighting"), Pattern.compile("^(.+)\\.kt$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiFileHighlighting"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("copyResolveBeforeParams.kt") public void testCopyResolveBeforeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/copyResolveBeforeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/copyResolveBeforeParams.kt"); doTest(fileName); } @TestMetadata("delegatesReference.kt") public void testDelegatesReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/delegatesReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/delegatesReference.kt"); doTest(fileName); } @TestMetadata("enumReference.kt") public void testEnumReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/enumReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/enumReference.kt"); doTest(fileName); } @TestMetadata("referencesFunWithUnspecifiedType.kt") public void testReferencesFunWithUnspecifiedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/referencesFunWithUnspecifiedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/referencesFunWithUnspecifiedType.kt"); doTest(fileName); } @TestMetadata("topLevelMembersReference.kt") public void testTopLevelMembersReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/topLevelMembersReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/topLevelMembersReference.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java index 1f53f431670..91eb3dbaa07 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @@ -40,48 +40,48 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractResolveByStubTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") public void testAnnotatedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt"); doTest(fileName); } @TestMetadata("AnnotatedMethod.kt") public void testAnnotatedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt"); doTest(fileName); } @TestMetadata("AnnotationInAnnotationArguments.kt") public void testAnnotationInAnnotationArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotationInAnnotationArguments.kt"); doTest(fileName); } @TestMetadata("EnumArgumentWithCustomToString.kt") public void testEnumArgumentWithCustomToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/EnumArgumentWithCustomToString.kt"); doTest(fileName); } @TestMetadata("MultiDimensionalArrayMethod.kt") public void testMultiDimensionalArrayMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/MultiDimensionalArrayMethod.kt"); doTest(fileName); } @TestMetadata("SimpleAnnotation.kt") public void testSimpleAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt"); doTest(fileName); } @TestMetadata("TargetedAnnotation.kt") public void testTargetedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/TargetedAnnotation.kt"); doTest(fileName); } @@ -90,54 +90,54 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractResolveByStubTest { public void testAllFilesPresentInClassMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectPropertyField.kt") public void testClassObjectPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt"); doTest(fileName); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Constructor.kt"); doTest(fileName); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt"); doTest(fileName); } } @@ -147,96 +147,96 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Classes extends AbstractResolveByStubTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationInClassObject.kt") public void testAnnotationInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassInClassObject.kt") public void testClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt"); doTest(fileName); } @TestMetadata("ClassObjectInStaticNestedClass.kt") public void testClassObjectInStaticNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt"); doTest(fileName); } @TestMetadata("DataClass.kt") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DataClass.kt"); doTest(fileName); } @TestMetadata("Deprecated.kt") public void testDeprecated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt"); doTest(fileName); } @TestMetadata("DollarsInAnnotationName.kt") public void testDollarsInAnnotationName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt"); doTest(fileName); } @TestMetadata("MultipleAnnotations.kt") public void testMultipleAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt"); doTest(fileName); } @TestMetadata("NestedAnnotation.kt") public void testNestedAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt"); doTest(fileName); } @TestMetadata("Retention.kt") public void testRetention() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt"); doTest(fileName); } @TestMetadata("WithArgument.kt") public void testWithArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt"); doTest(fileName); } @TestMetadata("WithMultipleArguments.kt") public void testWithMultipleArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt"); doTest(fileName); } } @@ -246,54 +246,54 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractResolveByStubTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DelegatedProperty.kt") public void testDelegatedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt"); doTest(fileName); } @TestMetadata("EnumArgument.kt") public void testEnumArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt"); doTest(fileName); } @TestMetadata("EnumArrayArgument.kt") public void testEnumArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt"); doTest(fileName); } @TestMetadata("Function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt"); doTest(fileName); } @TestMetadata("Getter.kt") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt"); doTest(fileName); } @TestMetadata("PropertyField.kt") public void testPropertyField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt"); doTest(fileName); } @TestMetadata("Setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt"); doTest(fileName); } @TestMetadata("StringArrayArgument.kt") public void testStringArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt"); doTest(fileName); } } @@ -303,78 +303,78 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractResolveByStubTest { public void testAllFilesPresentInParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor.kt") public void testConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt"); doTest(fileName); } @TestMetadata("EnumConstructor.kt") public void testEnumConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt"); doTest(fileName); } @TestMetadata("ExtensionFunction.kt") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt"); doTest(fileName); } @TestMetadata("ExtensionFunctionInClass.kt") public void testExtensionFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt"); doTest(fileName); } @TestMetadata("ExtensionPropertySetter.kt") public void testExtensionPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt"); doTest(fileName); } @TestMetadata("FunctionInClass.kt") public void testFunctionInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt"); doTest(fileName); } @TestMetadata("FunctionInTrait.kt") public void testFunctionInTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructor.kt") public void testInnerClassConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/InnerClassConstructor.kt"); doTest(fileName); } @TestMetadata("ManyAnnotations.kt") public void testManyAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt"); doTest(fileName); } @TestMetadata("PropertySetterInClass.kt") public void testPropertySetterInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt"); doTest(fileName); } @TestMetadata("TopLevelFunction.kt") public void testTopLevelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt"); doTest(fileName); } @TestMetadata("TopLevelPropertySetter.kt") public void testTopLevelPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt"); doTest(fileName); } } @@ -384,54 +384,54 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractResolveByStubTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNameClass.kt") public void testExtensionsWithSameNameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt"); doTest(fileName); } @TestMetadata("ExtensionsWithSameNamePackage.kt") public void testExtensionsWithSameNamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt"); doTest(fileName); } @TestMetadata("NestedTrait.kt") public void testNestedTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt"); doTest(fileName); } @TestMetadata("TopLevel.kt") public void testTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt"); doTest(fileName); } @TestMetadata("TraitClassObject.kt") public void testTraitClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt"); doTest(fileName); } } @@ -441,42 +441,42 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Types extends AbstractResolveByStubTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ReceiverParameter.kt") public void testReceiverParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/ReceiverParameter.kt"); doTest(fileName); } @TestMetadata("SimpleTypeAnnotation.kt") public void testSimpleTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.kt"); doTest(fileName); } @TestMetadata("SupertypesAndBounds.kt") public void testSupertypesAndBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/SupertypesAndBounds.kt"); doTest(fileName); } @TestMetadata("TypeAnnotationWithArguments.kt") public void testTypeAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotation.kt") public void testTypeParameterAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotation.kt"); doTest(fileName); } @TestMetadata("TypeParameterAnnotationWithArguments.kt") public void testTypeParameterAnnotationWithArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.kt"); doTest(fileName); } } @@ -486,18 +486,18 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class WithUseSiteTarget extends AbstractResolveByStubTest { public void testAllFilesPresentInWithUseSiteTarget() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FieldTarget.kt") public void testFieldTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/FieldTarget.kt"); doTest(fileName); } @TestMetadata("ReceiverTarget.kt") public void testReceiverTarget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.kt"); doTest(fileName); } } @@ -508,210 +508,210 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractResolveByStubTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt"); doTest(fileName); } @TestMetadata("ClassInParam.kt") public void testClassInParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt"); doTest(fileName); } @TestMetadata("ClassInnerClass.kt") public void testClassInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt"); doTest(fileName); } @TestMetadata("ClassMemberConflict.kt") public void testClassMemberConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt"); doTest(fileName); } @TestMetadata("ClassOutParam.kt") public void testClassOutParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt"); doTest(fileName); } @TestMetadata("ClassParam.kt") public void testClassParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam.kt") public void testClassParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesParam2.kt") public void testClassParamReferencesParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt"); doTest(fileName); } @TestMetadata("ClassParamReferencesSelf.kt") public void testClassParamReferencesSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassBound.kt") public void testClassParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperClassInterfaceBound.kt") public void testClassParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassParamUpperInterfaceBound.kt") public void testClassParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams.kt") public void testClassTwoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt"); doTest(fileName); } @TestMetadata("ClassTwoParams2.kt") public void testClassTwoParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt"); doTest(fileName); } @TestMetadata("EnumWithGenericConstructorParameter.kt") public void testEnumWithGenericConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt"); doTest(fileName); } @TestMetadata("EnumWithPrimitiveConstructorParameter.kt") public void testEnumWithPrimitiveConstructorParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt"); doTest(fileName); } @TestMetadata("InheritClassSimple.kt") public void testInheritClassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt"); doTest(fileName); } @TestMetadata("InheritClassWithParam.kt") public void testInheritClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt"); doTest(fileName); } @TestMetadata("InheritSubstitutedMethod.kt") public void testInheritSubstitutedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithFunctionParam.kt") public void testInheritTraitWithFunctionParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt"); doTest(fileName); } @TestMetadata("InheritTraitWithParam.kt") public void testInheritTraitWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt"); doTest(fileName); } @TestMetadata("InnerClassExtendInnerClass.kt") public void testInnerClassExtendInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt"); doTest(fileName); } @TestMetadata("InnerGenericClass.kt") public void testInnerGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClass.kt") public void testNamedObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt"); doTest(fileName); } @TestMetadata("NamedObjectInClassObject.kt") public void testNamedObjectInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectInNamedObject.kt") public void testNamedObjectInNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt"); doTest(fileName); } @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt") public void testNamedObjectWithAnotherTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt"); doTest(fileName); } @TestMetadata("NestedClassExtendNestedClass.kt") public void testNestedClassExtendNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt"); doTest(fileName); } @TestMetadata("NestedGenericClass.kt") public void testNestedGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt"); doTest(fileName); } @TestMetadata("RecursiveGeneric.kt") public void testRecursiveGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/RecursiveGeneric.kt"); doTest(fileName); } @TestMetadata("SingleAbstractMethod.kt") public void testSingleAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt"); doTest(fileName); } @TestMetadata("Trait.kt") public void testTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt"); doTest(fileName); } @@ -720,42 +720,42 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractResolveByStubTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") public void testDifferentGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanAbstractGetter.kt") public void testJavaBeanAbstractGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt"); doTest(fileName); } @TestMetadata("JavaBeanVal.kt") public void testJavaBeanVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt"); doTest(fileName); } @TestMetadata("JavaBeanVar.kt") public void testJavaBeanVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt"); doTest(fileName); } @TestMetadata("JavaBeanVarOfGenericType.kt") public void testJavaBeanVarOfGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt"); doTest(fileName); } @TestMetadata("TwoSetters.kt") public void testTwoSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt"); doTest(fileName); } } @@ -766,42 +766,42 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractResolveByStubTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") public void testClassInParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("ClassParamUsedInFun.kt") public void testClassParamUsedInFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt"); doTest(fileName); } @TestMetadata("FunDelegationToTraitImpl.kt") public void testFunDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("FunInParamSuper.kt") public void testFunInParamSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt"); doTest(fileName); } @TestMetadata("TraitFinalFun.kt") public void testTraitFinalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt"); doTest(fileName); } @TestMetadata("TraitOpenFun.kt") public void testTraitOpenFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt"); doTest(fileName); } } @@ -811,84 +811,84 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractResolveByStubTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") public void testClassObjectDeclaresVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt"); doTest(fileName); } @TestMetadata("ClassObjectDeclaresVar.kt") public void testClassObjectDeclaresVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt"); doTest(fileName); } @TestMetadata("ClassObjectDefaultVisibility.kt") public void testClassObjectDefaultVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExplicitVisibility.kt") public void testClassObjectExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTrait.kt") public void testClassObjectExtendsTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt"); doTest(fileName); } @TestMetadata("ClassObjectExtendsTraitWithTP.kt") public void testClassObjectExtendsTraitWithTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt"); doTest(fileName); } @TestMetadata("classObjectInClassStaticFields.kt") public void testClassObjectInClassStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt"); doTest(fileName); } @TestMetadata("classObjectInTraitStaticFields.kt") public void testClassObjectInTraitStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt"); doTest(fileName); } @TestMetadata("ClassObjectPropertyInClass.kt") public void testClassObjectPropertyInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt"); doTest(fileName); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt"); doTest(fileName); } @TestMetadata("InnerClassInClassObject.kt") public void testInnerClassInClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt"); doTest(fileName); } @TestMetadata("NamedClassObject.kt") public void testNamedClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/NamedClassObject.kt"); doTest(fileName); } @TestMetadata("SimpleClassObject.kt") public void testSimpleClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt"); doTest(fileName); } } @@ -898,102 +898,102 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractResolveByStubTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") public void testConstructor0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt"); doTest(fileName); } @TestMetadata("Constructor1.kt") public void testConstructor1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt"); doTest(fileName); } @TestMetadata("Constructor1WithParamDefaultValue.kt") public void testConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("Constructor2WithOneParamDefaultValue.kt") public void testConstructor2WithOneParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt"); doTest(fileName); } @TestMetadata("ConstructorCollectionParameter.kt") public void testConstructorCollectionParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericDeep.kt") public void testConstructorGenericDeep() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericSimple.kt") public void testConstructorGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt"); doTest(fileName); } @TestMetadata("ConstructorGenericUpperBound.kt") public void testConstructorGenericUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoDefArgs.kt") public void testConstructorWithTwoDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParameters.kt") public void testConstructorWithTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt") public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParameter.kt") public void testConstructorWithTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt"); doTest(fileName); } @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt") public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt"); doTest(fileName); } @TestMetadata("InnerClassConstructorWithDefArgs.kt") public void testInnerClassConstructorWithDefArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt"); doTest(fileName); } @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt") public void testPrivateConstructor1WithParamDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt"); doTest(fileName); } @@ -1002,18 +1002,18 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractResolveByStubTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") public void testConstructorNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt"); doTest(fileName); } @TestMetadata("ConstructorVararg.kt") public void testConstructorVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt"); doTest(fileName); } } @@ -1024,30 +1024,30 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class DataClass extends AbstractResolveByStubTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") public void testMixedComponents() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt"); doTest(fileName); } @TestMetadata("OneVal.kt") public void testOneVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt"); doTest(fileName); } @TestMetadata("TwoVals.kt") public void testTwoVals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt"); doTest(fileName); } @TestMetadata("TwoVars.kt") public void testTwoVars() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt"); doTest(fileName); } } @@ -1057,42 +1057,42 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractResolveByStubTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumVisibility.kt") public void testEnumVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt"); doTest(fileName); } @TestMetadata("enumWithConstuctor.kt") public void testEnumWithConstuctor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt"); doTest(fileName); } @TestMetadata("enumWithInnerClasses.kt") public void testEnumWithInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithInnerClasses.kt"); doTest(fileName); } @TestMetadata("innerEnum.kt") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt"); doTest(fileName); } @TestMetadata("innerEnumExistingClassObject.kt") public void testInnerEnumExistingClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt"); doTest(fileName); } } @@ -1102,210 +1102,210 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractResolveByStubTest { public void testAllFilesPresentInFromLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") public void testArrayTypeVariance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt"); doTest(fileName); } @TestMetadata("ClassDoesNotOverrideMethod.kt") public void testClassDoesNotOverrideMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt"); doTest(fileName); } @TestMetadata("classObjectAnnotation.kt") public void testClassObjectAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt"); doTest(fileName); } @TestMetadata("ClassWithConstVal.kt") public void testClassWithConstVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt"); doTest(fileName); } @TestMetadata("ClassWithTypeP.kt") public void testClassWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePExtendsIterableP.kt") public void testClassWithTypePExtendsIterableP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePP.kt") public void testClassWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefNext.kt") public void testClassWithTypePRefNext() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelf.kt") public void testClassWithTypePRefSelf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt"); doTest(fileName); } @TestMetadata("ClassWithTypePRefSelfAndClass.kt") public void testClassWithTypePRefSelfAndClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt"); doTest(fileName); } @TestMetadata("FieldAsVar.kt") public void testFieldAsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt"); doTest(fileName); } @TestMetadata("FieldOfArrayType.kt") public void testFieldOfArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt"); doTest(fileName); } @TestMetadata("FinalFieldAsVal.kt") public void testFinalFieldAsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt"); doTest(fileName); } @TestMetadata("genericFunction.kt") public void testGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypes.kt") public void testInheritMethodsDifferentReturnTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt") public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt"); doTest(fileName); } @TestMetadata("MethodTypePOneUpperBound.kt") public void testMethodTypePOneUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt"); doTest(fileName); } @TestMetadata("MethodTypePTwoUpperBounds.kt") public void testMethodTypePTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeP.kt") public void testMethodWithTypeP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePP.kt") public void testMethodWithTypePP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt"); doTest(fileName); } @TestMetadata("MethodWithTypePRefClassP.kt") public void testMethodWithTypePRefClassP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt"); doTest(fileName); } @TestMetadata("MethosWithPRefTP.kt") public void testMethosWithPRefTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt"); doTest(fileName); } @TestMetadata("MyException.kt") public void testMyException() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt"); doTest(fileName); } @TestMetadata("objectInClass.kt") public void testObjectInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt"); doTest(fileName); } @TestMetadata("objectMembers.kt") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt"); doTest(fileName); } @TestMetadata("packageLevelObject.kt") public void testPackageLevelObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt"); doTest(fileName); } @TestMetadata("RemoveRedundantProjectionKind.kt") public void testRemoveRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("Simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt"); doTest(fileName); } @TestMetadata("TwoFields.kt") public void testTwoFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt"); doTest(fileName); } @TestMetadata("UnboundWildcard.kt") public void testUnboundWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt"); doTest(fileName); } @@ -1315,101 +1315,101 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { public static class KotlinSignature extends AbstractResolveByStubTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt"); doTest(fileName); } public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt"); doTest(fileName); } @TestMetadata("ConstructorWithNewTypeParams.kt") public void testConstructorWithNewTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithParentTypeParams.kt") public void testConstructorWithParentTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithSeveralParams.kt") public void testConstructorWithSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt"); doTest(fileName); } @TestMetadata("ConstructorWithoutParams.kt") public void testConstructorWithoutParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt"); doTest(fileName); } @TestMetadata("CustomProjectionKind.kt") public void testCustomProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt"); doTest(fileName); } @TestMetadata("MethodWithFunctionTypes.kt") public void testMethodWithFunctionTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt"); doTest(fileName); } @TestMetadata("MethodWithGenerics.kt") public void testMethodWithGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt"); doTest(fileName); } @TestMetadata("MethodWithMappedClasses.kt") public void testMethodWithMappedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt"); doTest(fileName); } @TestMetadata("MethodWithTypeParameters.kt") public void testMethodWithTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt"); doTest(fileName); } @TestMetadata("MethodWithVararg.kt") public void testMethodWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt"); doTest(fileName); } @TestMetadata("PropertyArrayTypes.kt") public void testPropertyArrayTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt"); doTest(fileName); } @TestMetadata("PropertyComplexTypes.kt") public void testPropertyComplexTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt"); doTest(fileName); } @TestMetadata("PropertySimpleType.kt") public void testPropertySimpleType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt"); doTest(fileName); } @@ -1419,167 +1419,167 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { public static class Error extends AbstractResolveByStubTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt"); doTest(fileName); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") public void testConflictingProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt"); doTest(fileName); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") public void testExplicitFieldGettersAndSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt"); doTest(fileName); } @TestMetadata("ExtraUpperBound.kt") public void testExtraUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt"); doTest(fileName); } @TestMetadata("MissingUpperBound.kt") public void testMissingUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt"); doTest(fileName); } @TestMetadata("NoFieldTypeRef.kt") public void testNoFieldTypeRef() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt"); doTest(fileName); } @TestMetadata("NotVarargReplacedWithVararg.kt") public void testNotVarargReplacedWithVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt"); doTest(fileName); } @TestMetadata("RedundantProjectionKind.kt") public void testRedundantProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt"); doTest(fileName); } @TestMetadata("ReturnTypeMissing.kt") public void testReturnTypeMissing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt"); doTest(fileName); } @TestMetadata("SyntaxError.kt") public void testSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt"); doTest(fileName); } @TestMetadata("SyntaxErrorInFieldAnnotation.kt") public void testSyntaxErrorInFieldAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt"); doTest(fileName); } @TestMetadata("VarargReplacedWithNotVararg.kt") public void testVarargReplacedWithNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt"); doTest(fileName); } @TestMetadata("WrongFieldInitializer.kt") public void testWrongFieldInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt"); doTest(fileName); } @TestMetadata("WrongFieldMutability.kt") public void testWrongFieldMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt"); doTest(fileName); } @TestMetadata("WrongFieldName.kt") public void testWrongFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt"); doTest(fileName); } @TestMetadata("WrongMethodName.kt") public void testWrongMethodName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt"); doTest(fileName); } @TestMetadata("WrongProjectionKind.kt") public void testWrongProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt"); doTest(fileName); } @TestMetadata("WrongReturnTypeStructure.kt") public void testWrongReturnTypeStructure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt"); doTest(fileName); } @TestMetadata("WrongTypeName1.kt") public void testWrongTypeName1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt"); doTest(fileName); } @TestMetadata("WrongTypeName2.kt") public void testWrongTypeName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt"); doTest(fileName); } @TestMetadata("WrongTypeName3.kt") public void testWrongTypeName3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure1.kt") public void testWrongTypeParameterBoundStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt"); doTest(fileName); } @TestMetadata("WrongTypeParameterBoundStructure2.kt") public void testWrongTypeParameterBoundStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt"); doTest(fileName); } @TestMetadata("WrongTypeParametersCount.kt") public void testWrongTypeParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure1.kt") public void testWrongValueParameterStructure1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt"); doTest(fileName); } @TestMetadata("WrongValueParameterStructure2.kt") public void testWrongValueParameterStructure2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt"); doTest(fileName); } @TestMetadata("WrongValueParametersCount.kt") public void testWrongValueParametersCount() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt"); doTest(fileName); } } @@ -1589,12 +1589,12 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractResolveByStubTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") public void testPropagateTypeArgumentNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt"); doTest(fileName); } @@ -1603,162 +1603,162 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Parameter extends AbstractResolveByStubTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") public void testChangeProjectionKind1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt"); doTest(fileName); } @TestMetadata("ChangeProjectionKind2.kt") public void testChangeProjectionKind2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNotVararg.kt") public void testInheritNotVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargInteger.kt") public void testInheritNotVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargNotNull.kt") public void testInheritNotVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritNotVarargPrimitive.kt") public void testInheritNotVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("InheritVararg.kt") public void testInheritVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt"); doTest(fileName); } @TestMetadata("InheritVarargInteger.kt") public void testInheritVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt"); doTest(fileName); } @TestMetadata("InheritVarargNotNull.kt") public void testInheritVarargNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt"); doTest(fileName); } @TestMetadata("InheritVarargPrimitive.kt") public void testInheritVarargPrimitive() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt"); doTest(fileName); } @TestMetadata("Kt3302.kt") public void testKt3302() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt"); doTest(fileName); } @TestMetadata("MutableToReadOnly.kt") public void testMutableToReadOnly() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt"); doTest(fileName); } @TestMetadata("NotNullToNullable.kt") public void testNotNullToNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt"); doTest(fileName); } @TestMetadata("NullableToNotNull.kt") public void testNullableToNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt"); doTest(fileName); } @TestMetadata("NullableToNotNullKotlinSignature.kt") public void testNullableToNotNullKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt"); doTest(fileName); } @TestMetadata("OverrideWithErasedParameter.kt") public void testOverrideWithErasedParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt"); doTest(fileName); } @TestMetadata("ReadOnlyToMutable.kt") public void testReadOnlyToMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt"); doTest(fileName); } } @@ -1769,209 +1769,209 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { public static class Return extends AbstractResolveByStubTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNotNullSameJavaType.kt") public void testAddNotNullSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt"); doTest(fileName); } @TestMetadata("AddNullabilityJavaSubtype.kt") public void testAddNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType1.kt") public void testAddNullabilitySameGenericType1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameGenericType2.kt") public void testAddNullabilitySameGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt"); doTest(fileName); } @TestMetadata("AddNullabilitySameJavaType.kt") public void testAddNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt"); doTest(fileName); } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") public void testCantMakeImmutableInSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter.kt") public void testDeeplySubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("DeeplySubstitutedClassParameter2.kt") public void testDeeplySubstitutedClassParameter2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt"); doTest(fileName); } @TestMetadata("HalfSubstitutedTypeParameters.kt") public void testHalfSubstitutedTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityGenericSubclassSimple.kt") public void testInheritNullabilityGenericSubclassSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt"); doTest(fileName); } @TestMetadata("InheritNullabilityJavaSubtype.kt") public void testInheritNullabilityJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameGenericType.kt") public void testInheritNullabilitySameGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt"); doTest(fileName); } @TestMetadata("InheritNullabilitySameJavaType.kt") public void testInheritNullabilitySameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt"); doTest(fileName); } @TestMetadata("InheritProjectionKind.kt") public void testInheritProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessOfArgument.kt") public void testInheritReadOnlinessOfArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSameClass.kt") public void testInheritReadOnlinessSameClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt"); doTest(fileName); } @TestMetadata("InheritReadOnlinessSubclass.kt") public void testInheritReadOnlinessSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt"); doTest(fileName); } @TestMetadata("SameProjectionKind.kt") public void testSameProjectionKind() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt"); doTest(fileName); } @TestMetadata("SubclassFromGenericAndNot.kt") public void testSubclassFromGenericAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt"); doTest(fileName); } @TestMetadata("SubclassOfCollection.kt") public void testSubclassOfCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt"); doTest(fileName); } @TestMetadata("SubclassOfMapEntry.kt") public void testSubclassOfMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameter.kt") public void testSubstitutedClassParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt"); doTest(fileName); } @TestMetadata("SubstitutedClassParameters.kt") public void testSubstitutedClassParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt") public void testTwoSuperclassesConflictingProjectionKinds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt") public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt") public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesMutableAndNot.kt") public void testTwoSuperclassesMutableAndNot() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt") public void testTwoSuperclassesReturnJavaSubtype() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesReturnSameJavaType.kt") public void testTwoSuperclassesReturnSameJavaType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt"); doTest(fileName); } @TestMetadata("TwoSuperclassesSupplementNotNull.kt") public void testTwoSuperclassesSupplementNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClass.kt") public void testTypeParamOfClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt"); doTest(fileName); } @TestMetadata("TypeParamOfClassSubstituted.kt") public void testTypeParamOfClassSubstituted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt"); doTest(fileName); } @TestMetadata("TypeParamOfFun.kt") public void testTypeParamOfFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt"); doTest(fileName); } } @@ -1981,60 +1981,60 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractResolveByStubTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") public void testInheritMutability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt"); doTest(fileName); } @TestMetadata("InheritNullability.kt") public void testInheritNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt"); doTest(fileName); } @TestMetadata("InheritReadOnliness.kt") public void testInheritReadOnliness() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt"); doTest(fileName); } @TestMetadata("TwoBounds.kt") public void testTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt"); doTest(fileName); } @TestMetadata("TwoSuperclasses.kt") public void testTwoSuperclasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt"); doTest(fileName); } @TestMetadata("TwoTypeParameters.kt") public void testTwoTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt"); doTest(fileName); } @TestMetadata("UseParameterAsUpperBound.kt") public void testUseParameterAsUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBound.kt") public void testUseParameterInUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt"); doTest(fileName); } @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt") public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt"); doTest(fileName); } } @@ -2046,24 +2046,24 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Library extends AbstractResolveByStubTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") public void testLoadIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt"); doTest(fileName); } @TestMetadata("LoadIterator.kt") public void testLoadIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt"); doTest(fileName); } @TestMetadata("Max.kt") public void testMax() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt"); doTest(fileName); } } @@ -2073,12 +2073,12 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Modality extends AbstractResolveByStubTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") public void testModalityOfFakeOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt"); doTest(fileName); } } @@ -2088,36 +2088,36 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class NotNull extends AbstractResolveByStubTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") public void testNotNullField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt"); doTest(fileName); } @TestMetadata("NotNullIntArray.kt") public void testNotNullIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt"); doTest(fileName); } @TestMetadata("NotNullMethod.kt") public void testNotNullMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt"); doTest(fileName); } @TestMetadata("NotNullObjectArray.kt") public void testNotNullObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt"); doTest(fileName); } @TestMetadata("NotNullParameter.kt") public void testNotNullParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt"); doTest(fileName); } } @@ -2128,72 +2128,72 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractResolveByStubTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Assert.kt") public void testAssert() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt"); doTest(fileName); } @TestMetadata("DeclaredMemberOverridesDelegated.kt") public void testDeclaredMemberOverridesDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt"); doTest(fileName); } @TestMetadata("InfixKeyword.kt") public void testInfixKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InfixKeyword.kt"); doTest(fileName); } @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt") public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt"); doTest(fileName); } @TestMetadata("InheritValAndVar.kt") public void testInheritValAndVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt"); doTest(fileName); } @TestMetadata("InheritValsDifferentTypes.kt") public void testInheritValsDifferentTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt"); doTest(fileName); } @TestMetadata("NoSamAdapter.kt") public void testNoSamAdapter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt"); doTest(fileName); } @TestMetadata("NoSamConstructor.kt") public void testNoSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt"); doTest(fileName); } @TestMetadata("OperatorKeyword.kt") public void testOperatorKeyword() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/OperatorKeyword.kt"); doTest(fileName); } @TestMetadata("PropagateDeepSubclass.kt") public void testPropagateDeepSubclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt"); doTest(fileName); } @TestMetadata("PropagateSubclassOfComparable.kt") public void testPropagateSubclassOfComparable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt"); doTest(fileName); } @@ -2202,66 +2202,66 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractResolveByStubTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") public void testFunGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt"); doTest(fileName); } @TestMetadata("FunParamParam.kt") public void testFunParamParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt"); doTest(fileName); } @TestMetadata("FunParamParamErased.kt") public void testFunParamParamErased() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt"); doTest(fileName); } @TestMetadata("FunParamReferencesParam.kt") public void testFunParamReferencesParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt"); doTest(fileName); } @TestMetadata("FunParamTwoUpperBounds.kt") public void testFunParamTwoUpperBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassBound.kt") public void testFunParamUpperClassBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperClassInterfaceBound.kt") public void testFunParamUpperClassInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamUpperInterfaceBound.kt") public void testFunParamUpperInterfaceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt"); doTest(fileName); } @TestMetadata("FunParamVaragParam.kt") public void testFunParamVaragParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt"); doTest(fileName); } @TestMetadata("FunTwoTypeParams.kt") public void testFunTwoTypeParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt"); doTest(fileName); } } @@ -2271,36 +2271,36 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractResolveByStubTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") public void testFunClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunClassParamNullable.kt") public void testFunClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt"); doTest(fileName); } @TestMetadata("FunParamNullable.kt") public void testFunParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNotNull.kt") public void testReturnTypeClassParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeClassParamNullable.kt") public void testReturnTypeClassParamNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt"); doTest(fileName); } } @@ -2310,102 +2310,102 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractResolveByStubTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") public void testClassFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFoo.kt") public void testClassFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunGetFooSetFoo.kt") public void testClassFunGetFooSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt"); doTest(fileName); } @TestMetadata("ClassFunSetFoo.kt") public void testClassFunSetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt"); doTest(fileName); } @TestMetadata("ExtFun.kt") public void testExtFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt"); doTest(fileName); } @TestMetadata("ExtFunInClass.kt") public void testExtFunInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt"); doTest(fileName); } @TestMetadata("FunDefaultArg.kt") public void testFunDefaultArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt"); doTest(fileName); } @TestMetadata("FunParamNotNull.kt") public void testFunParamNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt"); doTest(fileName); } @TestMetadata("FunVarargInt.kt") public void testFunVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt"); doTest(fileName); } @TestMetadata("FunVarargInteger.kt") public void testFunVarargInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt"); doTest(fileName); } @TestMetadata("ModifierAbstract.kt") public void testModifierAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt"); doTest(fileName); } @TestMetadata("ModifierOpen.kt") public void testModifierOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt"); doTest(fileName); } @TestMetadata("NsFun.kt") public void testNsFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt"); doTest(fileName); } @TestMetadata("NsFunGetFoo.kt") public void testNsFunGetFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNotNull.kt") public void testReturnTypeNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt"); doTest(fileName); } @TestMetadata("ReturnTypeNullable.kt") public void testReturnTypeNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt"); doTest(fileName); } } @@ -2415,24 +2415,24 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Vararg extends AbstractResolveByStubTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") public void testNonLastVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt"); doTest(fileName); } @TestMetadata("VarargInt.kt") public void testVarargInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt"); doTest(fileName); } @TestMetadata("VarargString.kt") public void testVarargString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt"); doTest(fileName); } } @@ -2443,12 +2443,12 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Inline extends AbstractResolveByStubTest { public void testAllFilesPresentInInline() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inlineFunction.kt") public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt"); doTest(fileName); } } @@ -2458,42 +2458,42 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class MemberOrder extends AbstractResolveByStubTest { public void testAllFilesPresentInMemberOrder() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/memberOrder"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callablesNameClash.kt") public void testCallablesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/callablesNameClash.kt"); doTest(fileName); } @TestMetadata("enumEntries.kt") public void testEnumEntries() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/enumEntries.kt"); doTest(fileName); } @TestMetadata("extensionMembers.kt") public void testExtensionMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionMembers.kt"); doTest(fileName); } @TestMetadata("extensionPropertiesNameClash.kt") public void testExtensionPropertiesNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/extensionPropertiesNameClash.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void testInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/innerClasses.kt"); doTest(fileName); } @TestMetadata("topLevelCallables.kt") public void testTopLevelCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/memberOrder/topLevelCallables.kt"); doTest(fileName); } } @@ -2503,24 +2503,24 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Nested extends AbstractResolveByStubTest { public void testAllFilesPresentInNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/nested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("deepInnerGeneric.kt") public void testDeepInnerGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/deepInnerGeneric.kt"); doTest(fileName); } @TestMetadata("innerClassReferencesOuterTP.kt") public void testInnerClassReferencesOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/innerClassReferencesOuterTP.kt"); doTest(fileName); } @TestMetadata("membersReferenceOuterTP.kt") public void testMembersReferenceOuterTP() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt"); doTest(fileName); } } @@ -2530,18 +2530,18 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractResolveByStubTest { public void testAllFilesPresentInPlatformTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/platformTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("notnullTypeArgument.kt") public void testNotnullTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.kt"); doTest(fileName); } @TestMetadata("nullableTypeArgument.kt") public void testNullableTypeArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.kt"); doTest(fileName); } } @@ -2551,204 +2551,204 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractResolveByStubTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValAbstract.kt") public void testClassValAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt"); doTest(fileName); } @TestMetadata("CollectionSize.kt") public void testCollectionSize() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt"); doTest(fileName); } @TestMetadata("Const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Const.kt"); doTest(fileName); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt"); doTest(fileName); } @TestMetadata("ExtValClass.kt") public void testExtValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt"); doTest(fileName); } @TestMetadata("ExtValInClass.kt") public void testExtValInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt"); doTest(fileName); } @TestMetadata("ExtValInt.kt") public void testExtValInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequence.kt") public void testExtValIntCharSequence() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt"); doTest(fileName); } @TestMetadata("ExtValIntCharSequenceQ.kt") public void testExtValIntCharSequenceQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt"); doTest(fileName); } @TestMetadata("ExtValIntListQOfIntInClass.kt") public void testExtValIntListQOfIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTInClass.kt") public void testExtValIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtValIntTQInClass.kt") public void testExtValIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtValTIntInClass.kt") public void testExtValTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarClass.kt") public void testExtVarClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInClass.kt") public void testExtVarInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarInt.kt") public void testExtVarInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTInClass.kt") public void testExtVarIntTInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarIntTQInClass.kt") public void testExtVarIntTQInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarMapPQInt.kt") public void testExtVarMapPQInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt"); doTest(fileName); } @TestMetadata("ExtVarTIntInClass.kt") public void testExtVarTIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarTQIntInClass.kt") public void testExtVarTQIntInClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt"); doTest(fileName); } @TestMetadata("ExtVarl.kt") public void testExtVarl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt"); doTest(fileName); } @TestMetadata("NsVal.kt") public void testNsVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt"); doTest(fileName); } @TestMetadata("NsVar.kt") public void testNsVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt"); doTest(fileName); } @TestMetadata("OverrideClassVal.kt") public void testOverrideClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt"); doTest(fileName); } @TestMetadata("OverrideTraitVal.kt") public void testOverrideTraitVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt"); doTest(fileName); } @TestMetadata("PropFromSuperclass.kt") public void testPropFromSuperclass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt"); doTest(fileName); } @TestMetadata("TraitFinalVar.kt") public void testTraitFinalVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt"); doTest(fileName); } @TestMetadata("TraitOpenVal.kt") public void testTraitOpenVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt"); doTest(fileName); } @TestMetadata("VarDelegationToTraitImpl.kt") public void testVarDelegationToTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt"); doTest(fileName); } @TestMetadata("VarWithDelegated.kt") public void testVarWithDelegated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt"); doTest(fileName); } @@ -2757,66 +2757,66 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractResolveByStubTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") public void testClassVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt"); doTest(fileName); } @TestMetadata("ClassValParams.kt") public void testClassValParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt"); doTest(fileName); } @TestMetadata("ClassValWithGet.kt") public void testClassValWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVar.kt") public void testClassVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt"); doTest(fileName); } @TestMetadata("ClassVarModality.kt") public void testClassVarModality() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt"); doTest(fileName); } @TestMetadata("ClassVarParams.kt") public void testClassVarParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt"); doTest(fileName); } @TestMetadata("ClassVarWithGet.kt") public void testClassVarWithGet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt"); doTest(fileName); } @TestMetadata("ClassVarWithSet.kt") public void testClassVarWithSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt"); doTest(fileName); } @TestMetadata("ExtValLong.kt") public void testExtValLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt"); doTest(fileName); } @TestMetadata("ExtVarLong.kt") public void testExtVarLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt"); doTest(fileName); } } @@ -2827,186 +2827,186 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractResolveByStubTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") public void testAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt"); doTest(fileName); } @TestMetadata("AnyQ.kt") public void testAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt"); doTest(fileName); } @TestMetadata("ArrayOfInNumber.kt") public void testArrayOfInNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfInt.kt") public void testArrayOfInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt"); doTest(fileName); } @TestMetadata("ArrayOfInteger.kt") public void testArrayOfInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutNumber.kt") public void testArrayOfOutNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt"); doTest(fileName); } @TestMetadata("ArrayOfOutT.kt") public void testArrayOfOutT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt"); doTest(fileName); } @TestMetadata("ArrayOfString.kt") public void testArrayOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt"); doTest(fileName); } @TestMetadata("Function1IntString.kt") public void testFunction1IntString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt"); doTest(fileName); } @TestMetadata("Int.kt") public void testInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt"); doTest(fileName); } @TestMetadata("IntArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt"); doTest(fileName); } @TestMetadata("IntQ.kt") public void testIntQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt"); doTest(fileName); } @TestMetadata("jlInteger.kt") public void testJlInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt"); doTest(fileName); } @TestMetadata("jlIntegerQ.kt") public void testJlIntegerQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt"); doTest(fileName); } @TestMetadata("jlNumber.kt") public void testJlNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt"); doTest(fileName); } @TestMetadata("jlObject.kt") public void testJlObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt"); doTest(fileName); } @TestMetadata("jlObjectQ.kt") public void testJlObjectQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt"); doTest(fileName); } @TestMetadata("jlString.kt") public void testJlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt"); doTest(fileName); } @TestMetadata("jlStringQ.kt") public void testJlStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt"); doTest(fileName); } @TestMetadata("ListOfAny.kt") public void testListOfAny() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt"); doTest(fileName); } @TestMetadata("ListOfAnyQ.kt") public void testListOfAnyQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt"); doTest(fileName); } @TestMetadata("ListOfStar.kt") public void testListOfStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt"); doTest(fileName); } @TestMetadata("ListOfString.kt") public void testListOfString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt"); doTest(fileName); } @TestMetadata("ListOfjlString.kt") public void testListOfjlString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt"); doTest(fileName); } @TestMetadata("Nothing.kt") public void testNothing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt"); doTest(fileName); } @TestMetadata("NothingQ.kt") public void testNothingQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt"); doTest(fileName); } @TestMetadata("platform.kt") public void testPlatform() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/platform.kt"); doTest(fileName); } @TestMetadata("String.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt"); doTest(fileName); } @TestMetadata("StringQ.kt") public void testStringQ() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt"); doTest(fileName); } @TestMetadata("Unit.kt") public void testUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt"); doTest(fileName); } } @@ -3016,72 +3016,72 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractResolveByStubTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InternalClass.kt") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt"); doTest(fileName); } @TestMetadata("InternalConstructor.kt") public void testInternalConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt"); doTest(fileName); } @TestMetadata("InternalTopLevelMembers.kt") public void testInternalTopLevelMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt"); doTest(fileName); } @TestMetadata("PrivateClass.kt") public void testPrivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt"); doTest(fileName); } @TestMetadata("PrivateClassMembers.kt") public void testPrivateClassMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt"); doTest(fileName); } @TestMetadata("PrivateToThis.kt") public void testPrivateToThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateToThis.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelFun.kt") public void testPrivateTopLevelFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt"); doTest(fileName); } @TestMetadata("PrivateTopLevelVal.kt") public void testPrivateTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt"); doTest(fileName); } @TestMetadata("PropertyInConstructorExplicitVisibility.kt") public void testPropertyInConstructorExplicitVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt"); doTest(fileName); } @TestMetadata("TopLevelVarWithPrivateSetter.kt") public void testTopLevelVarWithPrivateSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java index da03d2c3c15..02a26cbb3f6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,222 +32,222 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class StubBuilderTestGenerated extends AbstractStubBuilderTest { public void testAllFilesPresentInStubs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/stubs"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/stubs"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotationClass.kt") public void testAnnotationClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnnotationClass.kt"); doTest(fileName); } @TestMetadata("AnnotationOnClass.kt") public void testAnnotationOnClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnClass.kt"); doTest(fileName); } @TestMetadata("AnnotationOnFunction.kt") public void testAnnotationOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnFunction.kt"); doTest(fileName); } @TestMetadata("AnnotationOnLocalFunction.kt") public void testAnnotationOnLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnLocalFunction.kt"); doTest(fileName); } @TestMetadata("AnnotationsOnPrimaryCtr.kt") public void testAnnotationsOnPrimaryCtr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationsOnPrimaryCtr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnnotationsOnPrimaryCtr.kt"); doTest(fileName); } @TestMetadata("AnonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/AnonymousObject.kt"); doTest(fileName); } @TestMetadata("ClassObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ClassObject.kt"); doTest(fileName); } @TestMetadata("ClassProperty.kt") public void testClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ClassProperty.kt"); doTest(fileName); } @TestMetadata("ClassTypeParameters.kt") public void testClassTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ClassTypeParameters.kt"); doTest(fileName); } @TestMetadata("Const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/Const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/Const.kt"); doTest(fileName); } @TestMetadata("DanglingAnnotations.kt") public void testDanglingAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/DanglingAnnotations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/DanglingAnnotations.kt"); doTest(fileName); } @TestMetadata("DynamicType.kt") public void testDynamicType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/DynamicType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/DynamicType.kt"); doTest(fileName); } @TestMetadata("FilePackage.kt") public void testFilePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FilePackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/FilePackage.kt"); doTest(fileName); } @TestMetadata("FunctionInNotNamedObject.kt") public void testFunctionInNotNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FunctionInNotNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/FunctionInNotNamedObject.kt"); doTest(fileName); } @TestMetadata("FunctionParameters.kt") public void testFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FunctionParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/FunctionParameters.kt"); doTest(fileName); } @TestMetadata("InnerClass.kt") public void testInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/InnerClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/InnerClass.kt"); doTest(fileName); } @TestMetadata("LocalClass.kt") public void testLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/LocalClass.kt"); doTest(fileName); } @TestMetadata("LocalClassInLocalFunction.kt") public void testLocalClassInLocalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalClassInLocalFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/LocalClassInLocalFunction.kt"); doTest(fileName); } @TestMetadata("LocalNamedObject.kt") public void testLocalNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalNamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/LocalNamedObject.kt"); doTest(fileName); } @TestMetadata("ManyAnnotationsOnFunction.kt") public void testManyAnnotationsOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ManyAnnotationsOnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ManyAnnotationsOnFunction.kt"); doTest(fileName); } @TestMetadata("MembersInLocalClass.kt") public void testMembersInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalClass.kt"); doTest(fileName); } @TestMetadata("MembersInLocalObject.kt") public void testMembersInLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalObject.kt"); doTest(fileName); } @TestMetadata("NamedObject.kt") public void testNamedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NamedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/NamedObject.kt"); doTest(fileName); } @TestMetadata("NotStorePropertiesFrom.kt") public void testNotStorePropertiesFrom() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertiesFrom.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertiesFrom.kt"); doTest(fileName); } @TestMetadata("NotStorePropertyFromDelegate.kt") public void testNotStorePropertyFromDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromDelegate.kt"); doTest(fileName); } @TestMetadata("NotStorePropertyFromInitializer.kt") public void testNotStorePropertyFromInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromInitializer.kt"); doTest(fileName); } @TestMetadata("ObjectInInitializer.kt") public void testObjectInInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ObjectInInitializer.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ObjectInInitializer.kt"); doTest(fileName); } @TestMetadata("ObjectInPropertyDelegate.kt") public void testObjectInPropertyDelegate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ObjectInPropertyDelegate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ObjectInPropertyDelegate.kt"); doTest(fileName); } @TestMetadata("PackageProperty.kt") public void testPackageProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/PackageProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/PackageProperty.kt"); doTest(fileName); } @TestMetadata("ParametersWithFqName.kt") public void testParametersWithFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ParametersWithFqName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/ParametersWithFqName.kt"); doTest(fileName); } @TestMetadata("PropertyAsPropertyInitalizerInvalidCode.kt") public void testPropertyAsPropertyInitalizerInvalidCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.kt"); doTest(fileName); } @TestMetadata("QualifiedAnnotationOnFunction.kt") public void testQualifiedAnnotationOnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/QualifiedAnnotationOnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/QualifiedAnnotationOnFunction.kt"); doTest(fileName); } @TestMetadata("SecondaryConstructors.kt") public void testSecondaryConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/SecondaryConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/SecondaryConstructors.kt"); doTest(fileName); } @TestMetadata("SimpleEnumBuild.kt") public void testSimpleEnumBuild() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/SimpleEnumBuild.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/SimpleEnumBuild.kt"); doTest(fileName); } @TestMetadata("StarProjection.kt") public void testStarProjection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/StarProjection.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/StarProjection.kt"); doTest(fileName); } @TestMetadata("TypeAnnotation.kt") public void testTypeAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/TypeAnnotation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/stubs/TypeAnnotation.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java index 6f6ec7a82e6..2064c8e348c 100644 --- a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java @@ -21,19 +21,19 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.load.java.structure.JavaClassifierType; import org.jetbrains.kotlin.load.java.structure.JavaType; import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter; import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeParameterImpl; -public abstract class AbstractJavaTypeSubstitutorTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractJavaTypeSubstitutorTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } public void doTest(@NotNull String testFile) { diff --git a/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java index fa7f40cf0c7..6977b8ec15d 100644 --- a/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,270 +32,270 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JavaTypeSubstitutorTestGenerated extends AbstractJavaTypeSubstitutorTest { public void testAllFilesPresentInTypeSubstitution() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typeSubstitution"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typeSubstitution"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayType.java") public void testArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/arrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/arrayType.java"); doTest(fileName); } @TestMetadata("classType.java") public void testClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/classType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/classType.java"); doTest(fileName); } @TestMetadata("classWithWildcard.java") public void testClassWithWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/classWithWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/classWithWildcard.java"); doTest(fileName); } @TestMetadata("genericArray.java") public void testGenericArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/genericArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/genericArray.java"); doTest(fileName); } @TestMetadata("innerParameter.java") public void testInnerParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/innerParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/innerParameter.java"); doTest(fileName); } @TestMetadata("intersectionType.java") public void testIntersectionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionType.java"); doTest(fileName); } @TestMetadata("intersectionTypeAsTypeParameter.java") public void testIntersectionTypeAsTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeAsTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeAsTypeParameter.java"); doTest(fileName); } @TestMetadata("intersectionTypeInEnum.java") public void testIntersectionTypeInEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInEnum.java"); doTest(fileName); } @TestMetadata("intersectionTypeInInterfaceDeclaration.java") public void testIntersectionTypeInInterfaceDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInInterfaceDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInInterfaceDeclaration.java"); doTest(fileName); } @TestMetadata("intersectionTypeInTypeVariableClass.java") public void testIntersectionTypeInTypeVariableClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInTypeVariableClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInTypeVariableClass.java"); doTest(fileName); } @TestMetadata("mapEntry.java") public void testMapEntry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/mapEntry.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/mapEntry.java"); doTest(fileName); } @TestMetadata("primitiveType.java") public void testPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/primitiveType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/primitiveType.java"); doTest(fileName); } @TestMetadata("rawArrayType.java") public void testRawArrayType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayType.java"); doTest(fileName); } @TestMetadata("rawArrayTypeParameterWithBound.java") public void testRawArrayTypeParameterWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayTypeParameterWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayTypeParameterWithBound.java"); doTest(fileName); } @TestMetadata("rawEnum.java") public void testRawEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawEnum.java"); doTest(fileName); } @TestMetadata("rawExtendsWildcard.java") public void testRawExtendsWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawExtendsWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawExtendsWildcard.java"); doTest(fileName); } @TestMetadata("rawIntersectionType.java") public void testRawIntersectionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawIntersectionType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawIntersectionType.java"); doTest(fileName); } @TestMetadata("rawSuperWildcard.java") public void testRawSuperWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawSuperWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawSuperWildcard.java"); doTest(fileName); } @TestMetadata("rawType.java") public void testRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawType.java"); doTest(fileName); } @TestMetadata("rawTypeInDeclaration.java") public void testRawTypeInDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeInDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeInDeclaration.java"); doTest(fileName); } @TestMetadata("rawTypeWithBound.java") public void testRawTypeWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithBound.java"); doTest(fileName); } @TestMetadata("rawTypeWithSelfReferenceBound.java") public void testRawTypeWithSelfReferenceBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithSelfReferenceBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithSelfReferenceBound.java"); doTest(fileName); } @TestMetadata("rawWildcardInTypeVariableClass.java") public void testRawWildcardInTypeVariableClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardInTypeVariableClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardInTypeVariableClass.java"); doTest(fileName); } @TestMetadata("rawWildcardWithBound.java") public void testRawWildcardWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardWithBound.java"); doTest(fileName); } @TestMetadata("selfReference.java") public void testSelfReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/selfReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/selfReference.java"); doTest(fileName); } @TestMetadata("twoParameters.java") public void testTwoParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParameters.java"); doTest(fileName); } @TestMetadata("twoParametersInSubClass.java") public void testTwoParametersInSubClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParametersInSubClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParametersInSubClass.java"); doTest(fileName); } @TestMetadata("typeVariableClass.java") public void testTypeVariableClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableClass.java"); doTest(fileName); } @TestMetadata("typeVariableRaw.java") public void testTypeVariableRaw() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableRaw.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableRaw.java"); doTest(fileName); } @TestMetadata("unboundedWildcard.java") public void testUnboundedWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcard.java"); doTest(fileName); } @TestMetadata("unboundedWildcardToTypeParameter.java") public void testUnboundedWildcardToTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcardToTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcardToTypeParameter.java"); doTest(fileName); } @TestMetadata("varargArray.java") public void testVarargArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArray.java"); doTest(fileName); } @TestMetadata("varargArrayTypeParameter.java") public void testVarargArrayTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArrayTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArrayTypeParameter.java"); doTest(fileName); } @TestMetadata("varargClass.java") public void testVarargClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClass.java"); doTest(fileName); } @TestMetadata("varargClassWithWildcard.java") public void testVarargClassWithWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClassWithWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClassWithWildcard.java"); doTest(fileName); } @TestMetadata("varargRawType.java") public void testVarargRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawType.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawType.java"); doTest(fileName); } @TestMetadata("varargRawTypeWithBound.java") public void testVarargRawTypeWithBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawTypeWithBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawTypeWithBound.java"); doTest(fileName); } @TestMetadata("varargToClass.java") public void testVarargToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClass.java"); doTest(fileName); } @TestMetadata("varargToClassWithWildcard.java") public void testVarargToClassWithWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClassWithWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClassWithWildcard.java"); doTest(fileName); } @TestMetadata("wildcardExtends.java") public void testWildcardExtends() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtends.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtends.java"); doTest(fileName); } @TestMetadata("wildcardExtendsObject.java") public void testWildcardExtendsObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsObject.java"); doTest(fileName); } @TestMetadata("wildcardExtendsTypeParameter.java") public void testWildcardExtendsTypeParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsTypeParameter.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsTypeParameter.java"); doTest(fileName); } @TestMetadata("wildcardSuper.java") public void testWildcardSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardSuper.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardSuper.java"); doTest(fileName); } @TestMetadata("wildcardToWildcard.java") public void testWildcardToWildcard() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardToWildcard.java"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardToWildcard.java"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt index 24f1565dc52..3b9db04ecb9 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.psi -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import com.intellij.psi.ElementManipulators import org.junit.Assert.* import com.intellij.openapi.util.TextRange -public class StringTemplateExpressionManipulatorTest : JetLightCodeInsightFixtureTestCase() { +public class StringTemplateExpressionManipulatorTest : KotlinLightCodeInsightFixtureTestCase() { public fun testSingleQuoted() { doTestContentChange("\"a\"", "b", "\"b\"") doTestContentChange("\"\"", "b", "\"b\"") @@ -67,5 +67,5 @@ public class StringTemplateExpressionManipulatorTest : JetLightCodeInsightFixtur assertEquals(expected, newExpression.getText()) } - override fun getProjectDescriptor() = JetLightProjectDescriptor.INSTANCE + override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE } diff --git a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt index fdc510e723f..3fc03a1e335 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.psi.KtStringTemplateExpression import org.junit.Assert.* import com.intellij.openapi.util.TextRange import java.util.HashMap -import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.KotlinLiteFixture import org.jetbrains.kotlin.test.ConfigurationKind -public class StringInjectionHostTest: JetLiteFixture() { +public class StringInjectionHostTest: KotlinLiteFixture() { public fun testRegular() { with (quoted("")) { checkInjection("", mapOf(0 to 1)) diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractPsiUnifierTest.kt b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractPsiUnifierTest.kt index 4524e9b26d8..991994c011a 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractPsiUnifierTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.psi.patternMatching -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.psiUtil.parents @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.KtWhenCondition import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf -public abstract class AbstractPsiUnifierTest : JetLightCodeInsightFixtureTestCase() { +public abstract class AbstractPsiUnifierTest : KotlinLightCodeInsightFixtureTestCase() { public fun doTest(filePath: String) { fun findPattern(file: KtFile): KtElement { val selectionModel = myFixture.getEditor().getSelectionModel() diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/PsiUnifierTestGenerated.java b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/PsiUnifierTestGenerated.java index 063b585defe..806ea6a3d46 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/PsiUnifierTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/PsiUnifierTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi.patternMatching; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -30,128 +30,128 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/unifier") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) -public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { +public class PsiUnifierTestGenerated extends AbstractPsiUnifierTest { public void testAllFilesPresentInUnifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/unifier/equivalence") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Equivalence extends AbstractJetPsiUnifierTest { + public static class Equivalence extends AbstractPsiUnifierTest { public void testAllFilesPresentInEquivalence() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/unifier/equivalence/controlStructures") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ControlStructures extends AbstractJetPsiUnifierTest { + public static class ControlStructures extends AbstractPsiUnifierTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("break.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/break.kt"); doTest(fileName); } @TestMetadata("continue.kt") public void testContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/continue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/continue.kt"); doTest(fileName); } @TestMetadata("doWhileRuntime.kt") public void testDoWhileRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/doWhileRuntime.kt"); doTest(fileName); } @TestMetadata("forRuntime.kt") public void testForRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/forRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/forRuntime.kt"); doTest(fileName); } @TestMetadata("ifElseRuntime.kt") public void testIfElseRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifElseRuntime.kt"); doTest(fileName); } @TestMetadata("ifRuntime.kt") public void testIfRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/ifRuntime.kt"); doTest(fileName); } @TestMetadata("labeledReturn.kt") public void testLabeledReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/labeledReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/labeledReturn.kt"); doTest(fileName); } @TestMetadata("throw.kt") public void testThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/throw.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/throw.kt"); doTest(fileName); } @TestMetadata("unitReturn.kt") public void testUnitReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/unitReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/unitReturn.kt"); doTest(fileName); } @TestMetadata("valuedReturn.kt") public void testValuedReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/valuedReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/valuedReturn.kt"); doTest(fileName); } @TestMetadata("whenWithSubjectRuntime.kt") public void testWhenWithSubjectRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithSubjectRuntime.kt"); doTest(fileName); } @TestMetadata("whenWithoutSubjectRuntime.kt") public void testWhenWithoutSubjectRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whenWithoutSubjectRuntime.kt"); doTest(fileName); } @TestMetadata("whileRuntime.kt") public void testWhileRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/whileRuntime.kt"); doTest(fileName); } @TestMetadata("idea/testData/unifier/equivalence/controlStructures/blocks") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Blocks extends AbstractJetPsiUnifierTest { + public static class Blocks extends AbstractPsiUnifierTest { public void testAllFilesPresentInBlocks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/controlStructures/blocks"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/controlStructures/blocks"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectsRuntime.kt") public void testAnonymousObjectsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/anonymousObjectsRuntime.kt"); doTest(fileName); } @TestMetadata("localFunctionsRuntime.kt") public void testLocalFunctionsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localFunctionsRuntime.kt"); doTest(fileName); } @TestMetadata("localVarsRuntime.kt") public void testLocalVarsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/controlStructures/blocks/localVarsRuntime.kt"); doTest(fileName); } } @@ -160,52 +160,52 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/declarations") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Declarations extends AbstractJetPsiUnifierTest { + public static class Declarations extends AbstractPsiUnifierTest { public void testAllFilesPresentInDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class ClassesAndObjects extends AbstractJetPsiUnifierTest { + public static class ClassesAndObjects extends AbstractPsiUnifierTest { public void testAllFilesPresentInClassesAndObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectBody.kt") public void testAnonymousObjectBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/anonymousObjectBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/anonymousObjectBody.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/delegation.kt"); doTest(fileName); } @TestMetadata("emptyBody.kt") public void testEmptyBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/emptyBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/emptyBody.kt"); doTest(fileName); } @TestMetadata("localClassBody.kt") public void testLocalClassBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/localClassBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/localClassBody.kt"); doTest(fileName); } @TestMetadata("localObjectBody.kt") public void testLocalObjectBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/localObjectBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/localObjectBody.kt"); doTest(fileName); } @TestMetadata("members.kt") public void testMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/classesAndObjects/members.kt"); doTest(fileName); } } @@ -213,70 +213,70 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/declarations/localCallables") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class LocalCallables extends AbstractJetPsiUnifierTest { + public static class LocalCallables extends AbstractPsiUnifierTest { public void testAllFilesPresentInLocalCallables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/localCallables"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/localCallables"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localExtensionFunctions.kt") public void testLocalExtensionFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt"); doTest(fileName); } @TestMetadata("localFunctions.kt") public void testLocalFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt"); doTest(fileName); } @TestMetadata("localVariables.kt") public void testLocalVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localVariables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/localVariables.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Lambdas extends AbstractJetPsiUnifierTest { + public static class Lambdas extends AbstractPsiUnifierTest { public void testAllFilesPresentInLambdas() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/localCallables/lambdas"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/localCallables/lambdas"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("multipleParamsRuntime.kt") public void testMultipleParamsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/multipleParamsRuntime.kt"); doTest(fileName); } @TestMetadata("noParams.kt") public void testNoParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/noParams.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/noParams.kt"); doTest(fileName); } @TestMetadata("receiverArgumentsRuntime.kt") public void testReceiverArgumentsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/receiverArgumentsRuntime.kt"); doTest(fileName); } @TestMetadata("singleParam.kt") public void testSingleParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/singleParam.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/singleParam.kt"); doTest(fileName); } @TestMetadata("unitCoercion.kt") public void testUnitCoercion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/unitCoercion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/localCallables/lambdas/unitCoercion.kt"); doTest(fileName); } } @@ -285,14 +285,14 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/declarations/typeParameters") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class TypeParameters extends AbstractJetPsiUnifierTest { + public static class TypeParameters extends AbstractPsiUnifierTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/declarations/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boundsAndConstraints.kt") public void testBoundsAndConstraints() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt"); doTest(fileName); } } @@ -301,58 +301,58 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Expressions extends AbstractJetPsiUnifierTest { + public static class Expressions extends AbstractPsiUnifierTest { public void testAllFilesPresentInExpressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayAccess.kt") public void testArrayAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/arrayAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/arrayAccess.kt"); doTest(fileName); } @TestMetadata("const.kt") public void testConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/const.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/const.kt"); doTest(fileName); } @TestMetadata("qualifiedName.kt") public void testQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/qualifiedName.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/qualifiedName.kt"); doTest(fileName); } @TestMetadata("simpleNameRuntime.kt") public void testSimpleNameRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/simpleNameRuntime.kt"); doTest(fileName); } @TestMetadata("stringTemplate.kt") public void testStringTemplate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/stringTemplate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/stringTemplate.kt"); doTest(fileName); } @TestMetadata("idea/testData/unifier/equivalence/expressions/callableReferences") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class CallableReferences extends AbstractJetPsiUnifierTest { + public static class CallableReferences extends AbstractPsiUnifierTest { public void testAllFilesPresentInCallableReferences() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/callableReferences"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/callableReferences"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classRefRuntime.kt") public void testClassRefRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/classRefRuntime.kt"); doTest(fileName); } @TestMetadata("functionRefRuntime.kt") public void testFunctionRefRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/callableReferences/functionRefRuntime.kt"); doTest(fileName); } } @@ -360,68 +360,68 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/calls") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Calls extends AbstractJetPsiUnifierTest { + public static class Calls extends AbstractPsiUnifierTest { public void testAllFilesPresentInCalls() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/calls"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/calls"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callAndCalleeRuntime.kt") public void testCallAndCalleeRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callAndCalleeRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callAndCalleeRuntime.kt"); doTest(fileName); } @TestMetadata("callTypeArgumentsRuntime.kt") public void testCallTypeArgumentsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt"); doTest(fileName); } @TestMetadata("callUnderSmartCast.kt") public void testCallUnderSmartCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callUnderSmartCast.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/callUnderSmartCast.kt"); doTest(fileName); } @TestMetadata("externalArgumentsRuntime.kt") public void testExternalArgumentsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/externalArgumentsRuntime.kt"); doTest(fileName); } @TestMetadata("extraArguments.kt") public void testExtraArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/extraArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/extraArguments.kt"); doTest(fileName); } @TestMetadata("implicitReceiverArgument.kt") public void testImplicitReceiverArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/implicitReceiverArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/implicitReceiverArgument.kt"); doTest(fileName); } @TestMetadata("implicitThis.kt") public void testImplicitThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/implicitThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/implicitThis.kt"); doTest(fileName); } @TestMetadata("safeCall.kt") public void testSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/safeCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/safeCall.kt"); doTest(fileName); } @TestMetadata("unresolved.kt") public void testUnresolved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/unresolved.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/unresolved.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/calls/varargs.kt"); doTest(fileName); } } @@ -429,26 +429,26 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/casts") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Casts extends AbstractJetPsiUnifierTest { + public static class Casts extends AbstractPsiUnifierTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/casts"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/casts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("as.kt") public void testAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/as.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/as.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/is.kt"); doTest(fileName); } @TestMetadata("safeAs.kt") public void testSafeAs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/safeAs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/casts/safeAs.kt"); doTest(fileName); } } @@ -456,106 +456,106 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/conventions") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Conventions extends AbstractJetPsiUnifierTest { + public static class Conventions extends AbstractPsiUnifierTest { public void testAllFilesPresentInConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("containsRuntime.kt") public void testContainsRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/containsRuntime.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/equals.kt"); doTest(fileName); } @TestMetadata("getRuntime.kt") public void testGetRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/getRuntime.kt"); doTest(fileName); } @TestMetadata("inc.kt") public void testInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/inc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/inc.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/infixCall.kt"); doTest(fileName); } @TestMetadata("lessThan.kt") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/lessThan.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/lessThan.kt"); doTest(fileName); } @TestMetadata("notContains.kt") public void testNotContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/notContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/notContains.kt"); doTest(fileName); } @TestMetadata("notEquals.kt") public void testNotEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/notEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/notEquals.kt"); doTest(fileName); } @TestMetadata("plus.kt") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/plus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/plus.kt"); doTest(fileName); } @TestMetadata("unaryMinus.kt") public void testUnaryMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/unaryMinus.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/unaryMinus.kt"); doTest(fileName); } @TestMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Assignments extends AbstractJetPsiUnifierTest { + public static class Assignments extends AbstractPsiUnifierTest { public void testAllFilesPresentInAssignments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions/assignments"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions/assignments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("indexedPlusAssignRuntime.kt") public void testIndexedPlusAssignRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/indexedPlusAssignRuntime.kt"); doTest(fileName); } @TestMetadata("plusAndAssign.kt") public void testPlusAndAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAndAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAndAssign.kt"); doTest(fileName); } @TestMetadata("plusAndAssignWithSet.kt") public void testPlusAndAssignWithSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAndAssignWithSet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAndAssignWithSet.kt"); doTest(fileName); } @TestMetadata("plusAssign.kt") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAssign.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/plusAssign.kt"); doTest(fileName); } @TestMetadata("setRuntime.kt") public void testSetRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/assignments/setRuntime.kt"); doTest(fileName); } } @@ -563,32 +563,32 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Invoke extends AbstractJetPsiUnifierTest { + public static class Invoke extends AbstractPsiUnifierTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/conventions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("invokeOnCall.kt") public void testInvokeOnCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnCall.kt"); doTest(fileName); } @TestMetadata("invokeOnConst.kt") public void testInvokeOnConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnConst.kt"); doTest(fileName); } @TestMetadata("invokeOnQualified.kt") public void testInvokeOnQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnQualified.kt"); doTest(fileName); } @TestMetadata("invokeOnVar.kt") public void testInvokeOnVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/conventions/invoke/invokeOnVar.kt"); doTest(fileName); } } @@ -597,26 +597,26 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/misc") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Misc extends AbstractJetPsiUnifierTest { + public static class Misc extends AbstractPsiUnifierTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("misc1.kt") public void testMisc1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc1.kt"); doTest(fileName); } @TestMetadata("misc2.kt") public void testMisc2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc2.kt"); doTest(fileName); } @TestMetadata("misc3.kt") public void testMisc3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/misc/misc3.kt"); doTest(fileName); } } @@ -624,32 +624,32 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/super") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Super extends AbstractJetPsiUnifierTest { + public static class Super extends AbstractPsiUnifierTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("multipleSuperTypes.kt") public void testMultipleSuperTypes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/multipleSuperTypes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/multipleSuperTypes.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass1.kt") public void testQualifiedByClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass1.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass2.kt") public void testQualifiedByClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass2.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass3.kt") public void testQualifiedByClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/super/qualifiedByClass3.kt"); doTest(fileName); } } @@ -657,62 +657,62 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/this") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class This extends AbstractJetPsiUnifierTest { + public static class This extends AbstractPsiUnifierTest { public void testAllFilesPresentInThis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/this"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/expressions/this"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjects.kt") public void testAnonymousObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/anonymousObjects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/anonymousObjects.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass1.kt") public void testQualifiedByClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass1.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass2.kt") public void testQualifiedByClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass2.kt"); doTest(fileName); } @TestMetadata("qualifiedByClass3.kt") public void testQualifiedByClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByClass3.kt"); doTest(fileName); } @TestMetadata("qualifiedByFunction1.kt") public void testQualifiedByFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction1.kt"); doTest(fileName); } @TestMetadata("qualifiedByFunction2.kt") public void testQualifiedByFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction2.kt"); doTest(fileName); } @TestMetadata("qualifiedByFunction3.kt") public void testQualifiedByFunction3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/qualifiedByFunction3.kt"); doTest(fileName); } @TestMetadata("simpleThis1Runtime.kt") public void testSimpleThis1Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis1Runtime.kt"); doTest(fileName); } @TestMetadata("simpleThis2Runtime.kt") public void testSimpleThis2Runtime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/expressions/this/simpleThis2Runtime.kt"); doTest(fileName); } } @@ -721,44 +721,44 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/types") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class Types extends AbstractJetPsiUnifierTest { + public static class Types extends AbstractPsiUnifierTest { public void testAllFilesPresentInTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/types"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/unifier/equivalence/types"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("function0.kt") public void testFunction0() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function0.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function0.kt"); doTest(fileName); } @TestMetadata("function1.kt") public void testFunction1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function1.kt"); doTest(fileName); } @TestMetadata("function2.kt") public void testFunction2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/function2.kt"); doTest(fileName); } @TestMetadata("nonNullable.kt") public void testNonNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/nonNullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/nonNullable.kt"); doTest(fileName); } @TestMetadata("nullable.kt") public void testNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/nullable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/nullable.kt"); doTest(fileName); } @TestMetadata("userTypeRuntime.kt") public void testUserTypeRuntime() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/userTypeRuntime.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/unifier/equivalence/types/userTypeRuntime.kt"); doTest(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java index a130a2e470e..9a53fc79151 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractSafeDeleteTest.java @@ -26,8 +26,8 @@ import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.*; @@ -36,11 +36,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public abstract class AbstractSafeDeleteTest extends JetLightCodeInsightFixtureTestCase { +public abstract class AbstractSafeDeleteTest extends KotlinLightCodeInsightFixtureTestCase { @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; + return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; } @Override diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java index 432cb82b130..9d4ba405e67 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/SafeDeleteTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.safeDelete; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -28,78 +28,78 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @RunWith(JUnit3RunnerWithInners.class) -public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { +public class SafeDeleteTestGenerated extends AbstractSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinClass extends AbstractJetSafeDeleteTest { + public static class KotlinClass extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class1.kt") public void testClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt"); doClassTest(fileName); } @TestMetadata("class2.kt") public void testClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt"); doClassTest(fileName); } @TestMetadata("classInString.kt") public void testClassInString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt"); doClassTest(fileName); } @TestMetadata("localClass1.kt") public void testLocalClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt"); doClassTest(fileName); } @TestMetadata("localClass2.kt") public void testLocalClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt"); doClassTest(fileName); } @TestMetadata("nestedClass1.kt") public void testNestedClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt"); doClassTest(fileName); } @TestMetadata("nestedClass2.kt") public void testNestedClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt"); doClassTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt"); doClassTest(fileName); } @TestMetadata("trait1.kt") public void testTrait1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt"); doClassTest(fileName); } @TestMetadata("trait2.kt") public void testTrait2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt"); doClassTest(fileName); } @TestMetadata("unsafeImport.kt") public void testUnsafeImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt"); doClassTest(fileName); } } @@ -107,14 +107,14 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinClassWithJava extends AbstractJetSafeDeleteTest { + public static class KotlinClassWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinClassWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClassWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClassWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithDelegationCalls.kt") public void testClassWithDelegationCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClassWithJava/classWithDelegationCalls.kt"); doClassTestWithJava(fileName); } } @@ -122,68 +122,68 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinObject extends AbstractJetSafeDeleteTest { + public static class KotlinObject extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt"); doObjectTest(fileName); } @TestMetadata("companionObject.kt") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/companionObject.kt"); doObjectTest(fileName); } @TestMetadata("localObject1.kt") public void testLocalObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt"); doObjectTest(fileName); } @TestMetadata("localObject2.kt") public void testLocalObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt"); doObjectTest(fileName); } @TestMetadata("nestedObject1.kt") public void testNestedObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt"); doObjectTest(fileName); } @TestMetadata("nestedObject2.kt") public void testNestedObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt"); doObjectTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt"); doObjectTest(fileName); } @TestMetadata("object1.kt") public void testObject1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt"); doObjectTest(fileName); } @TestMetadata("object2.kt") public void testObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt"); doObjectTest(fileName); } @TestMetadata("unsafeImport.kt") public void testUnsafeImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt"); doObjectTest(fileName); } } @@ -191,110 +191,110 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinFunction extends AbstractJetSafeDeleteTest { + public static class KotlinFunction extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fun1.kt") public void testFun1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt"); doFunctionTest(fileName); } @TestMetadata("fun2.kt") public void testFun2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt"); doFunctionTest(fileName); } @TestMetadata("funExt1.kt") public void testFunExt1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt"); doFunctionTest(fileName); } @TestMetadata("funExt2.kt") public void testFunExt2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt"); doFunctionTest(fileName); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt"); doFunctionTest(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt"); doFunctionTest(fileName); } @TestMetadata("localFun1.kt") public void testLocalFun1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt"); doFunctionTest(fileName); } @TestMetadata("localFun2.kt") public void testLocalFun2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt"); doFunctionTest(fileName); } @TestMetadata("localFunExt1.kt") public void testLocalFunExt1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt"); doFunctionTest(fileName); } @TestMetadata("localFunExt2.kt") public void testLocalFunExt2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt"); doFunctionTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt"); doFunctionTest(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt"); doFunctionTest(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt"); doFunctionTest(fileName); } @TestMetadata("overrideAndImplement3.kt") public void testOverrideAndImplement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt"); doFunctionTest(fileName); } @TestMetadata("overrideWithUsages.kt") public void testOverrideWithUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt"); doFunctionTest(fileName); } } @@ -302,74 +302,74 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinFunctionWithJava extends AbstractJetSafeDeleteTest { + public static class KotlinFunctionWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinFunctionWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funExt.kt") public void testFunExt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt"); doFunctionTestWithJava(fileName); } @TestMetadata("secondaryConstructor.kt") public void testSecondaryConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/secondaryConstructor.kt"); doFunctionTestWithJava(fileName); } } @@ -377,20 +377,20 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaFunctionWithKotlin extends AbstractJetSafeDeleteTest { + public static class JavaFunctionWithKotlin extends AbstractSafeDeleteTest { public void testAllFilesPresentInJavaFunctionWithKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("mixedHierarchy1.kt") public void testMixedHierarchy1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt"); doJavaMethodTest(fileName); } @TestMetadata("mixedHierarchy2.kt") public void testMixedHierarchy2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt"); doJavaMethodTest(fileName); } } @@ -398,146 +398,146 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinProperty extends AbstractJetSafeDeleteTest { + public static class KotlinProperty extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt"); doPropertyTest(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt"); doPropertyTest(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt"); doPropertyTest(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt"); doPropertyTest(fileName); } @TestMetadata("implement5.kt") public void testImplement5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt"); doPropertyTest(fileName); } @TestMetadata("implement6.kt") public void testImplement6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt"); doPropertyTest(fileName); } @TestMetadata("implement7.kt") public void testImplement7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt"); doPropertyTest(fileName); } @TestMetadata("implement8.kt") public void testImplement8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt"); doPropertyTest(fileName); } @TestMetadata("noUsages.kt") public void testNoUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt"); doPropertyTest(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt"); doPropertyTest(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt"); doPropertyTest(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt"); doPropertyTest(fileName); } @TestMetadata("override4.kt") public void testOverride4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement3.kt") public void testOverrideAndImplement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt"); doPropertyTest(fileName); } @TestMetadata("overrideAndImplement4.kt") public void testOverrideAndImplement4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt"); doPropertyTest(fileName); } @TestMetadata("overrideWithUsages.kt") public void testOverrideWithUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt"); doPropertyTest(fileName); } @TestMetadata("property1.kt") public void testProperty1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt"); doPropertyTest(fileName); } @TestMetadata("property2.kt") public void testProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt"); doPropertyTest(fileName); } @TestMetadata("propertyExt1.kt") public void testPropertyExt1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt"); doPropertyTest(fileName); } @TestMetadata("propertyExt2.kt") public void testPropertyExt2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt"); doPropertyTest(fileName); } @TestMetadata("propertyInLocalObject.kt") public void testPropertyInLocalObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyInLocalObject.kt"); doPropertyTest(fileName); } } @@ -545,74 +545,74 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinPropertyWithJava extends AbstractJetSafeDeleteTest { + public static class KotlinPropertyWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinPropertyWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("implement1.kt") public void testImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement2.kt") public void testImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement3.kt") public void testImplement3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("implement4.kt") public void testImplement4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override1.kt") public void testOverride1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override2.kt") public void testOverride2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override3.kt") public void testOverride3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("override4.kt") public void testOverride4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("overrideAndImplement1.kt") public void testOverrideAndImplement1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("overrideAndImplement2.kt") public void testOverrideAndImplement2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt"); doPropertyTestWithJava(fileName); } @TestMetadata("propertyExt.kt") public void testPropertyExt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt"); doPropertyTestWithJava(fileName); } } @@ -620,44 +620,44 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class JavaPropertyWithKotlin extends AbstractJetSafeDeleteTest { + public static class JavaPropertyWithKotlin extends AbstractSafeDeleteTest { public void testAllFilesPresentInJavaPropertyWithKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("middleJava1.kt") public void testMiddleJava1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava2.kt") public void testMiddleJava2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava3.kt") public void testMiddleJava3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava4.kt") public void testMiddleJava4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava5.kt") public void testMiddleJava5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt"); doJavaPropertyTest(fileName); } @TestMetadata("middleJava6.kt") public void testMiddleJava6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt"); doJavaPropertyTest(fileName); } } @@ -665,104 +665,104 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinTypeParameter extends AbstractJetSafeDeleteTest { + public static class KotlinTypeParameter extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internalUsages1.kt") public void testInternalUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages2.kt") public void testInternalUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages3.kt") public void testInternalUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages4.kt") public void testInternalUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt"); doTypeParameterTest(fileName); } @TestMetadata("internalUsages5.kt") public void testInternalUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt"); doTypeParameterTest(fileName); } @TestMetadata("safeUsagesWithConstraint1.kt") public void testSafeUsagesWithConstraint1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt"); doTypeParameterTest(fileName); } @TestMetadata("safeUsagesWithConstraint2.kt") public void testSafeUsagesWithConstraint2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subclass1.kt") public void testSubclass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt"); doTypeParameterTest(fileName); } @TestMetadata("subclass2.kt") public void testSubclass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst1.kt") public void testSubst1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst2.kt") public void testSubst2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst3.kt") public void testSubst3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst4.kt") public void testSubst4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst5.kt") public void testSubst5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst6.kt") public void testSubst6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt"); doTypeParameterTest(fileName); } @TestMetadata("subst7.kt") public void testSubst7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt"); doTypeParameterTest(fileName); } } @@ -770,110 +770,110 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinTypeParameterWithJava extends AbstractJetSafeDeleteTest { + public static class KotlinTypeParameterWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internalUsages1.kt") public void testInternalUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages2.kt") public void testInternalUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages3.kt") public void testInternalUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages4.kt") public void testInternalUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("internalUsages5.kt") public void testInternalUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("rawType.kt") public void testRawType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("safeUsagesWithConstraint1.kt") public void testSafeUsagesWithConstraint1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("safeUsagesWithConstraint2.kt") public void testSafeUsagesWithConstraint2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subclass1.kt") public void testSubclass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subclass2.kt") public void testSubclass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst1.kt") public void testSubst1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst2.kt") public void testSubst2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst3.kt") public void testSubst3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst4.kt") public void testSubst4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst5.kt") public void testSubst5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst6.kt") public void testSubst6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt"); doTypeParameterTestWithJava(fileName); } @TestMetadata("subst7.kt") public void testSubst7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt"); doTypeParameterTestWithJava(fileName); } } @@ -881,200 +881,200 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinValueParameter extends AbstractJetSafeDeleteTest { + public static class KotlinValueParameter extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataClassComponent.kt") public void testDataClassComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/dataClassComponent.kt"); doValueParameterTest(fileName); } @TestMetadata("defaultParam1.kt") public void testDefaultParam1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("defaultParam2.kt") public void testDefaultParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("extNamedParam1.kt") public void testExtNamedParam1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("extNamedParam2.kt") public void testExtNamedParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages1.kt") public void testHierarchyWithSafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages2.kt") public void testHierarchyWithSafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages3.kt") public void testHierarchyWithSafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages4.kt") public void testHierarchyWithSafeUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithSafeUsages5.kt") public void testHierarchyWithSafeUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages1.kt") public void testHierarchyWithUnsafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages2.kt") public void testHierarchyWithUnsafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages3.kt") public void testHierarchyWithUnsafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages4.kt") public void testHierarchyWithUnsafeUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages5.kt") public void testHierarchyWithUnsafeUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages6.kt") public void testHierarchyWithUnsafeUsages6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages7.kt") public void testHierarchyWithUnsafeUsages7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt"); doValueParameterTest(fileName); } @TestMetadata("hierarchyWithUnsafeUsages8.kt") public void testHierarchyWithUnsafeUsages8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt"); doValueParameterTest(fileName); } @TestMetadata("internalUsage1.kt") public void testInternalUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt"); doValueParameterTest(fileName); } @TestMetadata("internalUsage2.kt") public void testInternalUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt"); doValueParameterTest(fileName); } @TestMetadata("lambdaArg.kt") public void testLambdaArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt"); doValueParameterTest(fileName); } @TestMetadata("lambdaArgExt.kt") public void testLambdaArgExt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt"); doValueParameterTest(fileName); } @TestMetadata("namedParam1.kt") public void testNamedParam1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("namedParam2.kt") public void testNamedParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("propertyParam1.kt") public void testPropertyParam1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt"); doValueParameterTest(fileName); } @TestMetadata("propertyParam2.kt") public void testPropertyParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages1.kt") public void testSafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages2.kt") public void testSafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsages3.kt") public void testSafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsagesExt1.kt") public void testSafeUsagesExt1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt"); doValueParameterTest(fileName); } @TestMetadata("safeUsagesExt2.kt") public void testSafeUsagesExt2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt"); doValueParameterTest(fileName); } @TestMetadata("setter.kt") public void testSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt"); doValueParameterTest(fileName); } } @@ -1082,176 +1082,176 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class KotlinValueParameterWithJava extends AbstractJetSafeDeleteTest { + public static class KotlinValueParameterWithJava extends AbstractSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataClassComponent.kt") public void testDataClassComponent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/dataClassComponent.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages1.kt") public void testHierarchyWithSafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages2.kt") public void testHierarchyWithSafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages3.kt") public void testHierarchyWithSafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages4.kt") public void testHierarchyWithSafeUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithSafeUsages5.kt") public void testHierarchyWithSafeUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages1.kt") public void testHierarchyWithUnsafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages2.kt") public void testHierarchyWithUnsafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages3.kt") public void testHierarchyWithUnsafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages4.kt") public void testHierarchyWithUnsafeUsages4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("hierarchyWithUnsafeUsages5.kt") public void testHierarchyWithUnsafeUsages5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("internalUsage1.kt") public void testInternalUsage1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("internalUsage2.kt") public void testInternalUsage2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("lambdaArg.kt") public void testLambdaArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("lambdaArgExt.kt") public void testLambdaArgExt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy1.kt") public void testMixedHierarchy1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy2.kt") public void testMixedHierarchy2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchy3.kt") public void testMixedHierarchy3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages1.kt") public void testMixedHierarchyWithUnsafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages2.kt") public void testMixedHierarchyWithUnsafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("mixedHierarchyWithUnsafeUsages3.kt") public void testMixedHierarchyWithUnsafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("propertyParam1.kt") public void testPropertyParam1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("propertyParam2.kt") public void testPropertyParam2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages1.kt") public void testSafeUsages1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages2.kt") public void testSafeUsages2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsages3.kt") public void testSafeUsages3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsagesExt1.kt") public void testSafeUsagesExt1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt"); doValueParameterTestWithJava(fileName); } @TestMetadata("safeUsagesExt2.kt") public void testSafeUsagesExt2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt"); doValueParameterTestWithJava(fileName); } } diff --git a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java index f3049320d9a..0a171353e3b 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java @@ -25,7 +25,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.kotlin.idea.test.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.TestUtilsKt; import org.jetbrains.kotlin.test.InTextDirectivesUtils; @@ -88,6 +88,6 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { - return JetLightProjectDescriptor.INSTANCE; + return KotlinLightProjectDescriptor.INSTANCE; } } diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java index cdde585708d..7ad1f75b427 100644 --- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/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.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; @@ -33,7 +33,7 @@ import java.util.List; public class JUnitMembersSearcherTest extends AbstractSearcherTest { private static final LightProjectDescriptor junitProjectDescriptor = - new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar")); + new KotlinJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.12.jar")); public void testJunit3() throws IOException { doJUnit3test(); diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java index 7bc766e3453..921fd103a92 100644 --- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.shortenRefs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { public void testAllFilesPresentInShortenRefs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("ClassNameConflict.kt") public void testClassNameConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/ClassNameConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/ClassNameConflict.kt"); doTest(fileName); } @TestMetadata("ClassNameConflictNoPackageImport.kt") public void testClassNameConflictNoPackageImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/ClassNameConflictNoPackageImport.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/classObject.kt"); doTest(fileName); } @TestMetadata("descriptorsChangeAfterImportInsertion.kt") public void testDescriptorsChangeAfterImportInsertion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/descriptorsChangeAfterImportInsertion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/descriptorsChangeAfterImportInsertion.kt"); doTest(fileName); } @TestMetadata("JavaStaticMethod.kt") public void testJavaStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/JavaStaticMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/JavaStaticMethod.kt"); doTest(fileName); } @TestMetadata("noShortening.kt") public void testNoShortening() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/noShortening.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/noShortening.kt"); doTest(fileName); } @TestMetadata("PackagesToUseStarImports.kt") public void testPackagesToUseStarImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/PackagesToUseStarImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/PackagesToUseStarImports.kt"); doTest(fileName); } @@ -82,96 +82,96 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractShortenRefsTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/constructor"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/constructor"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("Ambiguous.kt") public void testAmbiguous() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/Ambiguous.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/Ambiguous.kt"); doTest(fileName); } @TestMetadata("GenericType.kt") public void testGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/GenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/GenericType.kt"); doTest(fileName); } @TestMetadata("LeaveQualified.kt") public void testLeaveQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified.kt"); doTest(fileName); } @TestMetadata("LeaveQualified1.kt") public void testLeaveQualified1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified1.kt"); doTest(fileName); } @TestMetadata("LeaveQualified2.kt") public void testLeaveQualified2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified2.kt"); doTest(fileName); } @TestMetadata("LeaveQualified3.kt") public void testLeaveQualified3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified3.kt"); doTest(fileName); } @TestMetadata("LeaveQualified5.kt") public void testLeaveQualified5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified5.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified5.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClass.kt"); doTest(fileName); } @TestMetadata("NestedClassWithImport.kt") public void testNestedClassWithImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClassWithImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClassWithImport.kt"); doTest(fileName); } @TestMetadata("NoImportNeeded.kt") public void testNoImportNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded.kt"); doTest(fileName); } @TestMetadata("NoImportNeeded2.kt") public void testNoImportNeeded2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded2.kt"); doTest(fileName); } @TestMetadata("NoImportNeeded3.kt") public void testNoImportNeeded3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded3.kt"); doTest(fileName); } @TestMetadata("SAMConstructorFromLambda.kt") public void testSAMConstructorFromLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/SAMConstructorFromLambda.kt"); doTest(fileName); } @TestMetadata("WorksForClassNameRange.kt") public void testWorksForClassNameRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange.kt"); doTest(fileName); } @TestMetadata("WorksForClassNameRange2.kt") public void testWorksForClassNameRange2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt"); doTest(fileName); } } @@ -181,24 +181,24 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Imports extends AbstractShortenRefsTest { public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("importGlobalCallables.kt") public void testImportGlobalCallables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/importGlobalCallables.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/importGlobalCallables.kt"); doTest(fileName); } @TestMetadata("leaveQualifiedConstructor.kt") public void testLeaveQualifiedConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt"); doTest(fileName); } @TestMetadata("leaveQualifiedType.kt") public void testLeaveQualifiedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedType.kt"); doTest(fileName); } } @@ -208,60 +208,60 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Java extends AbstractShortenRefsTest { public void testAllFilesPresentInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/java"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/java"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("innerClassImport.kt") public void testInnerClassImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassImport.kt"); doTest(fileName); } @TestMetadata("innerClassNoImports.kt") public void testInnerClassNoImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassNoImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassNoImports.kt"); doTest(fileName); } @TestMetadata("innerClassOnDemandImport.kt") public void testInnerClassOnDemandImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassOnDemandImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassOnDemandImport.kt"); doTest(fileName); } @TestMetadata("staticClassNoImports.kt") public void testStaticClassNoImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassNoImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassNoImports.kt"); doTest(fileName); } @TestMetadata("staticClassOnDemandImport.kt") public void testStaticClassOnDemandImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassOnDemandImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassOnDemandImport.kt"); doTest(fileName); } @TestMetadata("staticFieldNoImports.kt") public void testStaticFieldNoImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldNoImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldNoImports.kt"); doTest(fileName); } @TestMetadata("staticFieldOnDemandImport.kt") public void testStaticFieldOnDemandImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldOnDemandImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldOnDemandImport.kt"); doTest(fileName); } @TestMetadata("staticMethodNoImports.kt") public void testStaticMethodNoImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodNoImports.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodNoImports.kt"); doTest(fileName); } @TestMetadata("staticMethodOnDemandImport.kt") public void testStaticMethodOnDemandImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodOnDemandImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodOnDemandImport.kt"); doTest(fileName); } } @@ -271,54 +271,54 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @RunWith(JUnit3RunnerWithInners.class) public static class This extends AbstractShortenRefsTest { public void testAllFilesPresentInThis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/this"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/this"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("cantShortenThis.kt") public void testCantShortenThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/cantShortenThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/cantShortenThis.kt"); doTest(fileName); } @TestMetadata("cantShortenThisLabel.kt") public void testCantShortenThisLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/cantShortenThisLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/cantShortenThisLabel.kt"); doTest(fileName); } @TestMetadata("shortenExtensionThis.kt") public void testShortenExtensionThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenExtensionThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenExtensionThis.kt"); doTest(fileName); } @TestMetadata("shortenThis.kt") public void testShortenThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThis.kt"); doTest(fileName); } @TestMetadata("shortenThisBothReceivers.kt") public void testShortenThisBothReceivers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisBothReceivers.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisBothReceivers.kt"); doTest(fileName); } @TestMetadata("shortenThisLabel.kt") public void testShortenThisLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisLabel.kt"); doTest(fileName); } @TestMetadata("shortenThisWithLabel.kt") public void testShortenThisWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisWithLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/shortenThisWithLabel.kt"); doTest(fileName); } @TestMetadata("visitorConflict.kt") public void testVisitorConflict() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/this/visitorConflict.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/this/visitorConflict.kt"); doTest(fileName); } } @@ -328,114 +328,114 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @RunWith(JUnit3RunnerWithInners.class) public static class Type extends AbstractShortenRefsTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/type"), Pattern.compile("^([^\\.]+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/type"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("ClassNameInsideArguments.kt") public void testClassNameInsideArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideArguments.kt"); doTest(fileName); } @TestMetadata("ClassNameInsideLambda.kt") public void testClassNameInsideLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideLambda.kt"); doTest(fileName); } @TestMetadata("ClassSameNameAsPackage.kt") public void testClassSameNameAsPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt"); doTest(fileName); } @TestMetadata("delegationSpecifier.kt") public void testDelegationSpecifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/delegationSpecifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/delegationSpecifier.kt"); doTest(fileName); } @TestMetadata("FunctionType.kt") public void testFunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/FunctionType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/FunctionType.kt"); doTest(fileName); } @TestMetadata("GenericType.kt") public void testGenericType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType.kt"); doTest(fileName); } @TestMetadata("GenericType2.kt") public void testGenericType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType2.kt"); doTest(fileName); } @TestMetadata("GenericType3.kt") public void testGenericType3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType3.kt"); doTest(fileName); } @TestMetadata("LeaveQualified.kt") public void testLeaveQualified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/LeaveQualified.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/LeaveQualified.kt"); doTest(fileName); } @TestMetadata("NestedClass.kt") public void testNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClass.kt"); doTest(fileName); } @TestMetadata("NestedClassRefInImport.kt") public void testNestedClassRefInImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClassRefInImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClassRefInImport.kt"); doTest(fileName); } @TestMetadata("NoImportNeeded.kt") public void testNoImportNeeded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded.kt"); doTest(fileName); } @TestMetadata("NoImportNeeded2.kt") public void testNoImportNeeded2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded2.kt"); doTest(fileName); } @TestMetadata("NullableType.kt") public void testNullableType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NullableType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NullableType.kt"); doTest(fileName); } @TestMetadata("OtherClassWithThisNameImported.kt") public void testOtherClassWithThisNameImported() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/OtherClassWithThisNameImported.kt"); doTest(fileName); } @TestMetadata("SameClassTwice.kt") public void testSameClassTwice() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SameClassTwice.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SameClassTwice.kt"); doTest(fileName); } @TestMetadata("SimpleAddImport.kt") public void testSimpleAddImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SimpleAddImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SimpleAddImport.kt"); doTest(fileName); } @TestMetadata("TwoClassesSameNames.kt") public void testTwoClassesSameNames() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/TwoClassesSameNames.kt"); + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/type/TwoClassesSameNames.kt"); doTest(fileName); } } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index ff94be745dd..c13b30c5f39 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -22,14 +22,14 @@ import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import com.intellij.testFramework.LightPlatformTestCase import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor import org.jetbrains.kotlin.idea.test.dumpTextWithErrors import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.ArrayList @@ -71,7 +71,7 @@ public abstract class AbstractJavaToKotlinConverterMultiFileTest : AbstractJavaT } for ((i, kotlinFile) in resultFiles.withIndex()) { - JetTestUtils.assertEqualsToFile(expectedResultFile(i), kotlinFile.dumpTextWithErrors()) + KotlinTestUtils.assertEqualsToFile(expectedResultFile(i), kotlinFile.dumpTextWithErrors()) } for ((externalFile, externalPsiFile) in externalFiles.zip(externalPsiFiles)) { @@ -83,10 +83,10 @@ public abstract class AbstractJavaToKotlinConverterMultiFileTest : AbstractJavaT //TODO: errors dump for java files too externalPsiFile.getText() } - JetTestUtils.assertEqualsToFile(expectedFile, resultText) + KotlinTestUtils.assertEqualsToFile(expectedFile, resultText) } } override fun getProjectDescriptor() - = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 07f38903398..9271bcf9e99 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -24,10 +24,10 @@ import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.testFramework.LightPlatformTestCase import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.dumpTextWithErrors import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.regex.Pattern @@ -54,7 +54,7 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava } var settings = ConverterSettings.defaultSettings.copy() - val directives = JetTestUtils.parseDirectives(javaCode) + val directives = KotlinTestUtils.parseDirectives(javaCode) for ((name, value) in directives) { when (name) { "forceNotNullTypes" -> settings.forceNotNullTypes = parseBoolean(value) @@ -85,13 +85,13 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava val kotlinPath = javaPath.replace(".java", ".kt") val expectedFile = File(kotlinPath) - JetTestUtils.assertEqualsToFile(expectedFile, actual) + KotlinTestUtils.assertEqualsToFile(expectedFile, actual) } private fun reformat(text: String, project: Project, inFunContext: Boolean): String { val textToFormat = if (inFunContext) "fun convertedTemp() {\n$text\n}" else text - val convertedFile = JetTestUtils.createFile("converted", textToFormat, project) + val convertedFile = KotlinTestUtils.createFile("converted", textToFormat, project) WriteCommandAction.runWriteCommandAction(project) { CodeStyleManager.getInstance(project)!!.reformat(convertedFile) } @@ -126,7 +126,7 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava } override fun getProjectDescriptor() - = JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE + = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE private fun String.removeFirstLine() = substringAfter('\n', "") diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 1d143f2e759..5d164978480 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -23,14 +23,14 @@ import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public abstract class AbstractJavaToKotlinConverterTest : LightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) invalidateLibraryCache(project) @@ -39,7 +39,7 @@ public abstract class AbstractJavaToKotlinConverterTest : LightCodeInsightFixtur } override fun tearDown() { - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) super.tearDown() } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 651a6e68272..065da559f37 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFileOrElement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("j2k/testData/fileOrElement/annotations") @@ -40,72 +40,72 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("annotationInterface1.java") public void testAnnotationInterface1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface1.java"); doTest(fileName); } @TestMetadata("annotationInterface2.java") public void testAnnotationInterface2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface2.java"); doTest(fileName); } @TestMetadata("annotationInterface3.java") public void testAnnotationInterface3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface3.java"); doTest(fileName); } @TestMetadata("annotationInterface4.java") public void testAnnotationInterface4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface4.java"); doTest(fileName); } @TestMetadata("annotationUsages.java") public void testAnnotationUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationUsages.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationUsages.java"); doTest(fileName); } @TestMetadata("javaClassArgument.java") public void testJavaClassArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArgument.java"); doTest(fileName); } @TestMetadata("javaClassArrayArgument.java") public void testJavaClassArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArrayArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArrayArgument.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNull.java") public void testJetbrainsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNullChainExpr.java") public void testJetbrainsNotNullChainExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); doTest(fileName); } @TestMetadata("jetbrainsNullable.java") public void testJetbrainsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNullable.java"); doTest(fileName); } @TestMetadata("primaryConstructorAnnotation.java") public void testPrimaryConstructorAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java"); doTest(fileName); } } @@ -115,18 +115,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AnonymousBlock extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAnonymousBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("oneAnonBlock.java") public void testOneAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); doTest(fileName); } @TestMetadata("oneStaticAnonBlock.java") public void testOneStaticAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); doTest(fileName); } } @@ -136,24 +136,24 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayAccessExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("expressionIndex.java") public void testExpressionIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); doTest(fileName); } @TestMetadata("intIndex.java") public void testIntIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/intIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/intIndex.java"); doTest(fileName); } @TestMetadata("variableIndex.java") public void testVariableIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); doTest(fileName); } } @@ -163,78 +163,78 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayInitializerExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("doubleArray.java") public void testDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); doTest(fileName); } @TestMetadata("doubleArrayWithVariables.java") public void testDoubleArrayWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); doTest(fileName); } @TestMetadata("floatArray.java") public void testFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); doTest(fileName); } @TestMetadata("intArrayWithLength.java") public void testIntArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); doTest(fileName); } @TestMetadata("javaLangDoubleArray.java") public void testJavaLangDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); doTest(fileName); } @TestMetadata("javaLangFloatArray.java") public void testJavaLangFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); doTest(fileName); } @TestMetadata("newByte.java") public void testNewByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newByte.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newByte.java"); doTest(fileName); } @TestMetadata("newInt.java") public void testNewInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newInt.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newInt.java"); doTest(fileName); } @TestMetadata("objectArrayWithLength.java") public void testObjectArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); doTest(fileName); } @TestMetadata("oneDim.java") public void testOneDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); doTest(fileName); } @TestMetadata("oneDimWithVariables.java") public void testOneDimWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); doTest(fileName); } @TestMetadata("twoDim.java") public void testTwoDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); doTest(fileName); } } @@ -244,66 +244,66 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInArrayType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayInitializationStatement.java") public void testArrayInitializationStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension.java") public void testArrayInitializationStatementWithDimension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension3d.java") public void testArrayInitializationStatementWithDimension3d() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java") public void testArrayInitializationStatementWithDimensionExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); doTest(fileName); } @TestMetadata("d2StringEmptyArray.java") public void testD2StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); doTest(fileName); } @TestMetadata("d3StringEmptyArray.java") public void testD3StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); doTest(fileName); } @TestMetadata("longArray.java") public void testLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/longArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/longArray.java"); doTest(fileName); } @TestMetadata("methodArrayArgs.java") public void testMethodArrayArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/methodArrayArgs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/methodArrayArgs.java"); doTest(fileName); } @TestMetadata("newIntArray.java") public void testNewIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newIntArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newIntArray.java"); doTest(fileName); } @TestMetadata("newStringArray.java") public void testNewStringArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newStringArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newStringArray.java"); doTest(fileName); } } @@ -313,30 +313,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AssertStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAssertStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("onlyCondition.java") public void testOnlyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyCondition.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyCondition.java"); doTest(fileName); } @TestMetadata("onlyConditionWithBraces.java") public void testOnlyConditionWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); doTest(fileName); } @TestMetadata("withStringDetail.java") public void testWithStringDetail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail.java"); doTest(fileName); } @TestMetadata("withStringDetail2.java") public void testWithStringDetail2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail2.java"); doTest(fileName); } } @@ -346,96 +346,96 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AssignmentExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInAssignmentExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/and.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/and.java"); doTest(fileName); } @TestMetadata("assignment.java") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/assignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/assignment.java"); doTest(fileName); } @TestMetadata("divideAssign.java") public void testDivideAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/divideAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/divideAssign.java"); doTest(fileName); } @TestMetadata("minusAssign.java") public void testMinusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/minusAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/minusAssign.java"); doTest(fileName); } @TestMetadata("multiplyAssign.java") public void testMultiplyAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); doTest(fileName); } @TestMetadata("nullability.java") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability.java"); doTest(fileName); } @TestMetadata("nullability-settings.java") public void testNullability_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/or.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/or.java"); doTest(fileName); } @TestMetadata("plusAssign.java") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/plusAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/plusAssign.java"); doTest(fileName); } @TestMetadata("reminder.java") public void testReminder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/reminder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/reminder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftLeft.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("simpleAssignment.java") public void testSimpleAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/xor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/xor.java"); doTest(fileName); } } @@ -445,114 +445,114 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BinaryExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/and.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/and.java"); doTest(fileName); } @TestMetadata("conditionalAnd.java") public void testConditionalAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalAnd.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalAnd.java"); doTest(fileName); } @TestMetadata("conditionalOr.java") public void testConditionalOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalOr.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalOr.java"); doTest(fileName); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/divide.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/divide.java"); doTest(fileName); } @TestMetadata("greaterThan.java") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThan.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThan.java"); doTest(fileName); } @TestMetadata("greaterThanEqual.java") public void testGreaterThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); doTest(fileName); } @TestMetadata("lessThan.java") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThan.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThan.java"); doTest(fileName); } @TestMetadata("lessThanEqual.java") public void testLessThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThanEqual.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThanEqual.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/minus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/minus.java"); doTest(fileName); } @TestMetadata("multiplePlusMinus.java") public void testMultiplePlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiply.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiply.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/or.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/or.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/plus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/remainder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/remainder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftLeft.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/xor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/xor.java"); doTest(fileName); } } @@ -562,12 +562,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Blocks extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBlocks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Blocks.java") public void testBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/blocks/Blocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/blocks/Blocks.java"); doTest(fileName); } } @@ -577,72 +577,72 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BoxedType extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBoxedType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("boolean.java") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/boolean.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/boolean.java"); doTest(fileName); } @TestMetadata("Boxing.java") public void testBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/Boxing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/Boxing.java"); doTest(fileName); } @TestMetadata("byte.java") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/byte.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/byte.java"); doTest(fileName); } @TestMetadata("character.java") public void testCharacter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/character.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/character.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/double.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/double.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/float.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/float.java"); doTest(fileName); } @TestMetadata("integer.java") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/integer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/integer.java"); doTest(fileName); } @TestMetadata("kt-671.java") public void testKt_671() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/kt-671.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/kt-671.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/long.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/long.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/object.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/object.java"); doTest(fileName); } @TestMetadata("short.java") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/short.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/short.java"); doTest(fileName); } } @@ -652,18 +652,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BreakStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInBreakStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("breakWithLabel.java") public void testBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithLabel.java"); doTest(fileName); } @TestMetadata("breakWithoutLabel.java") public void testBreakWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); doTest(fileName); } } @@ -673,42 +673,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class CallChainExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInCallChainExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("libraryFieldCall.java") public void testLibraryFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCall.java") public void testLibraryMethodCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance.java") public void testLibraryMethodCallFromInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance-settings.java") public void testLibraryMethodCallFromInstance_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); doTest(fileName); } @TestMetadata("libraryStringFieldCall.java") public void testLibraryStringFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); doTest(fileName); } @TestMetadata("sout.java") public void testSout() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/sout.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/sout.java"); doTest(fileName); } } @@ -719,197 +719,197 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class Class extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstractClass.java") public void testAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClass.java"); doTest(fileName); } @TestMetadata("abstractClassShape.java") public void testAbstractClassShape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClassShape.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClassShape.java"); doTest(fileName); } public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java"); doTest(fileName); } @TestMetadata("ClassShadowing.java") public void testClassShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/ClassShadowing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/ClassShadowing.java"); doTest(fileName); } @TestMetadata("classWithEmptyMethods.java") public void testClassWithEmptyMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithEmptyMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithEmptyMethods.java"); doTest(fileName); } @TestMetadata("classWithFields.java") public void testClassWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithFields.java"); doTest(fileName); } @TestMetadata("classWithMultiplyFields.java") public void testClassWithMultiplyFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithMultiplyFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithMultiplyFields.java"); doTest(fileName); } @TestMetadata("emptyClass.java") public void testEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/emptyClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/emptyClass.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsOneInterface.java") public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("finalClass.java") public void testFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/finalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/finalClass.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/genericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/genericClass.java"); doTest(fileName); } @TestMetadata("innerClassInInterface.java") public void testInnerClassInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerClassInInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerClassInInterface.java"); doTest(fileName); } @TestMetadata("innerEmptyClass.java") public void testInnerEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEmptyClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEmptyClass.java"); doTest(fileName); } @TestMetadata("innerEnum.java") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEnum.java"); doTest(fileName); } @TestMetadata("innerInterface.java") public void testInnerInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerInterface.java"); doTest(fileName); } @TestMetadata("innerStaticClass.java") public void testInnerStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerStaticClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerStaticClass.java"); doTest(fileName); } @TestMetadata("internalClass.java") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/internalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/internalClass.java"); doTest(fileName); } @TestMetadata("kt-639.java") public void testKt_639() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/kt-639.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/kt-639.java"); doTest(fileName); } @TestMetadata("notUtilityClass.java") public void testNotUtilityClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/notUtilityClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/notUtilityClass.java"); doTest(fileName); } @TestMetadata("oneStaticFieldOneNonStatic.java") public void testOneStaticFieldOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); doTest(fileName); } @TestMetadata("oneStaticMethod.java") public void testOneStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethod.java"); doTest(fileName); } @TestMetadata("oneStaticMethodOneNonStatic.java") public void testOneStaticMethodOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); doTest(fileName); } @TestMetadata("pivateClass.java") public void testPivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/pivateClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/pivateClass.java"); doTest(fileName); } @TestMetadata("privateInit.java") public void testPrivateInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/privateInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/privateInit.java"); doTest(fileName); } @TestMetadata("protectedClass.java") public void testProtectedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/protectedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/protectedClass.java"); doTest(fileName); } @TestMetadata("publicClass.java") public void testPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/publicClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/publicClass.java"); doTest(fileName); } @TestMetadata("simpleInheritance.java") public void testSimpleInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/simpleInheritance.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/simpleInheritance.java"); doTest(fileName); } @TestMetadata("twoStaticMethod.java") public void testTwoStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/twoStaticMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/twoStaticMethod.java"); doTest(fileName); } @TestMetadata("utilityClass1.java") public void testUtilityClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass1.java"); doTest(fileName); } @TestMetadata("utilityClass2.java") public void testUtilityClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass2.java"); doTest(fileName); } @TestMetadata("utilityClass3.java") public void testUtilityClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass3.java"); doTest(fileName); } } @@ -919,30 +919,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ClassExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complexExample.java") public void testComplexExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/complexExample.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/complexExample.java"); doTest(fileName); } @TestMetadata("objectClass.java") public void testObjectClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/objectClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/objectClass.java"); doTest(fileName); } @TestMetadata("primitivesAndArrays.java") public void testPrimitivesAndArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/primitivesAndArrays.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/primitivesAndArrays.java"); doTest(fileName); } @TestMetadata("stringClass.java") public void testStringClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/stringClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/stringClass.java"); doTest(fileName); } } @@ -952,36 +952,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Comments extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments.java"); doTest(fileName); } @TestMetadata("comments2.java") public void testComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments2.java"); doTest(fileName); } @TestMetadata("commentsForConstructors.java") public void testCommentsForConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/commentsForConstructors.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/commentsForConstructors.java"); doTest(fileName); } @TestMetadata("fieldWithEndOfLineComment.java") public void testFieldWithEndOfLineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams.java") public void testFieldsInitializedFromParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); doTest(fileName); } } @@ -991,18 +991,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ConditionalExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInConditionalExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/multiline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/multiline.java"); doTest(fileName); } @TestMetadata("simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/simple.java"); doTest(fileName); } } @@ -1013,251 +1013,251 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class Constructors extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("allCallsPrimary.java") public void testAllCallsPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary.java"); doTest(fileName); } @TestMetadata("allCallsPrimary2.java") public void testAllCallsPrimary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary2.java"); doTest(fileName); } public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("artificialPrimary.java") public void testArtificialPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/artificialPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/artificialPrimary.java"); doTest(fileName); } @TestMetadata("chain.java") public void testChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/chain.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/chain.java"); doTest(fileName); } @TestMetadata("constructorAnnotations.java") public void testConstructorAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/constructorAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/constructorAnnotations.java"); doTest(fileName); } @TestMetadata("customerBuilder.java") public void testCustomerBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/customerBuilder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/customerBuilder.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams1.java") public void testFieldsInitializedFromParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams2.java") public void testFieldsInitializedFromParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams3.java") public void testFieldsInitializedFromParams3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams4.java") public void testFieldsInitializedFromParams4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams5.java") public void testFieldsInitializedFromParams5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams6.java") public void testFieldsInitializedFromParams6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams7.java") public void testFieldsInitializedFromParams7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams8.java") public void testFieldsInitializedFromParams8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams9.java") public void testFieldsInitializedFromParams9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParamsAnnotations.java") public void testFieldsInitializedFromParamsAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.java"); doTest(fileName); } @TestMetadata("genericIdentifier.java") public void testGenericIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/genericIdentifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/genericIdentifier.java"); doTest(fileName); } @TestMetadata("identifier.java") public void testIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/identifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/identifier.java"); doTest(fileName); } @TestMetadata("lineBreaksBetweenParameters.java") public void testLineBreaksBetweenParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.java"); doTest(fileName); } @TestMetadata("methodCallInFactoryFun.java") public void testMethodCallInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults.java") public void testNestedClassNameInParameterDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults2.java") public void testNestedClassNameInParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults3.java") public void testNestedClassNameInParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults4.java") public void testNestedClassNameInParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); doTest(fileName); } @TestMetadata("nestedClassNameInSuperParameters.java") public void testNestedClassNameInSuperParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); doTest(fileName); } @TestMetadata("noPrimary.java") public void testNoPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/noPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/noPrimary.java"); doTest(fileName); } @TestMetadata("parameterDefaults1.java") public void testParameterDefaults1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults1.java"); doTest(fileName); } @TestMetadata("parameterDefaults2.java") public void testParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults2.java"); doTest(fileName); } @TestMetadata("parameterDefaults3.java") public void testParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults3.java"); doTest(fileName); } @TestMetadata("parameterDefaults4.java") public void testParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults4.java"); doTest(fileName); } @TestMetadata("parameterDefaults5.java") public void testParameterDefaults5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults5.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterModification.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterModification.java"); doTest(fileName); } @TestMetadata("privateConstructors.java") public void testPrivateConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/privateConstructors.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/privateConstructors.java"); doTest(fileName); } @TestMetadata("qualifiedRefInFactoryFun.java") public void testQualifiedRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("secondaryConstructorWithDefaultValues.java") public void testSecondaryConstructorWithDefaultValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.java"); doTest(fileName); } @TestMetadata("secondaryConstructorWithDefaultValues2.java") public void testSecondaryConstructorWithDefaultValues2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInInnerClass.java") public void testSecondaryConstructorsInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInNestedClass.java") public void testSecondaryConstructorsInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsVisibility.java") public void testSecondaryConstructorsVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); doTest(fileName); } @TestMetadata("staticFieldRefInFactoryFun.java") public void testStaticFieldRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("withManyDefaultParams.java") public void testWithManyDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/withManyDefaultParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/withManyDefaultParams.java"); doTest(fileName); } } @@ -1267,18 +1267,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ContinueStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInContinueStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("continueWithLabel.java") public void testContinueWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithLabel.java"); doTest(fileName); } @TestMetadata("continueWithoutLabel.java") public void testContinueWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); doTest(fileName); } } @@ -1288,42 +1288,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInDeclarationStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiplyFinalIntDeclaration.java") public void testMultiplyFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("multiplyIntDeclaration.java") public void testMultiplyIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalIntDeclaration.java") public void testSingleFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalStringDeclaration.java") public void testSingleFinalStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); doTest(fileName); } @TestMetadata("singleIntDeclaration.java") public void testSingleIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleStringDeclaration.java") public void testSingleStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); doTest(fileName); } } @@ -1334,185 +1334,185 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class DetectProperties extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("AccessInGetterWithThis.java") public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); doTest(fileName); } @TestMetadata("AccessorsImplementInterface.java") public void testAccessorsImplementInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); doTest(fileName); } public void testAllFilesPresentInDetectProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnonymousClass.java") public void testAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); doTest(fileName); } @TestMetadata("CannotDropOnlySetter.java") public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); doTest(fileName); } @TestMetadata("Comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Comments.java"); doTest(fileName); } @TestMetadata("DataClass.java") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); doTest(fileName); } @TestMetadata("DataClassWithMutableField.java") public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); doTest(fileName); } @TestMetadata("DifferentFieldName.java") public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); doTest(fileName); } @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); doTest(fileName); } @TestMetadata("DifferentFieldNameAndSuperClass.java") public void testDifferentFieldNameAndSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); doTest(fileName); } @TestMetadata("DifferentProtectedFieldName.java") public void testDifferentProtectedFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); doTest(fileName); } @TestMetadata("DropGetter.java") public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); doTest(fileName); } @TestMetadata("DropGetterAndSetter.java") public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); doTest(fileName); } @TestMetadata("DropGetterForMutable.java") public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); doTest(fileName); } @TestMetadata("FalseGetter.java") public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); doTest(fileName); } @TestMetadata("FalseSetter.java") public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); doTest(fileName); } @TestMetadata("FieldUsagesInFactoryMethods.java") public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); doTest(fileName); } @TestMetadata("GetterAndSetterNamesDifferent.java") public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); doTest(fileName); } @TestMetadata("GetterSetterUsages.java") public void testGetterSetterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); doTest(fileName); } @TestMetadata("GetterTypeNotMatch.java") public void testGetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); doTest(fileName); } @TestMetadata("InCompanionObject.java") public void testInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); doTest(fileName); } @TestMetadata("InInterface.java") public void testInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); doTest(fileName); } @TestMetadata("InObject.java") public void testInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); doTest(fileName); } @TestMetadata("IsPrefix.java") public void testIsPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/IsPrefix.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/IsPrefix.java"); doTest(fileName); } @TestMetadata("JavaKeywordPropertyName.java") public void testJavaKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); doTest(fileName); } @TestMetadata("KeywordPropertyName.java") public void testKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); doTest(fileName); } @TestMetadata("OverridesOfExternalCode.java") public void testOverridesOfExternalCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); doTest(fileName); } @TestMetadata("PropertyType.java") public void testPropertyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/PropertyType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/PropertyType.java"); doTest(fileName); } @TestMetadata("SetterTypeNotMatch.java") public void testSetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); doTest(fileName); } } @@ -1522,30 +1522,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DoWhileStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInDoWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); doTest(fileName); } } @@ -1555,54 +1555,54 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DocComments extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInDocComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("deprecatedDocTag.java") public void testDeprecatedDocTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/deprecatedDocTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/deprecatedDocTag.java"); doTest(fileName); } @TestMetadata("docCommentWithParamTag.java") public void testDocCommentWithParamTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/docCommentWithParamTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/docCommentWithParamTag.java"); doTest(fileName); } @TestMetadata("htmlInDocComment.java") public void testHtmlInDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java"); doTest(fileName); } @TestMetadata("inlineTagsInDocComment.java") public void testInlineTagsInDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.java"); doTest(fileName); } @TestMetadata("linkTag.java") public void testLinkTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTag.java"); doTest(fileName); } @TestMetadata("linkTagWithLabel.java") public void testLinkTagWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTagWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTagWithLabel.java"); doTest(fileName); } @TestMetadata("onlyDeprecatedDocTag.java") public void testOnlyDeprecatedDocTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.java"); doTest(fileName); } @TestMetadata("seeTag.java") public void testSeeTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/seeTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/seeTag.java"); doTest(fileName); } } @@ -1612,114 +1612,114 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("colorEnum.java") public void testColorEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/colorEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/colorEnum.java"); doTest(fileName); } @TestMetadata("companionObject.java") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/companionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/companionObject.java"); doTest(fileName); } @TestMetadata("constantsWithBody1.java") public void testConstantsWithBody1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody1.java"); doTest(fileName); } @TestMetadata("constantsWithBody2.java") public void testConstantsWithBody2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody2.java"); doTest(fileName); } @TestMetadata("emptyEnum.java") public void testEmptyEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/emptyEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/emptyEnum.java"); doTest(fileName); } @TestMetadata("enumConstantIsNotNull.java") public void testEnumConstantIsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumConstantIsNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumConstantIsNotNull.java"); doTest(fileName); } @TestMetadata("enumImplementsOneInterface.java") public void testEnumImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("enumImplementsSeveralInterfaces.java") public void testEnumImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("enumWithNameField.java") public void testEnumWithNameField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumWithNameField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumWithNameField.java"); doTest(fileName); } @TestMetadata("fieldsWithPrimaryPrivateConstructor.java") public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("internalEnum.java") public void testInternalEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/internalEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/internalEnum.java"); doTest(fileName); } @TestMetadata("overrideToString.java") public void testOverrideToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/overrideToString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/overrideToString.java"); doTest(fileName); } @TestMetadata("primaryPrivateConstructor.java") public void testPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/primaryPrivateConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/primaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("privateEnum.java") public void testPrivateEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/privateEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/privateEnum.java"); doTest(fileName); } @TestMetadata("protectedEnum.java") public void testProtectedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/protectedEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/protectedEnum.java"); doTest(fileName); } @TestMetadata("publicEnum.java") public void testPublicEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/publicEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/publicEnum.java"); doTest(fileName); } @TestMetadata("runnableImplementation.java") public void testRunnableImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/runnableImplementation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/runnableImplementation.java"); doTest(fileName); } @TestMetadata("typeSafeEnum.java") public void testTypeSafeEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/typeSafeEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/typeSafeEnum.java"); doTest(fileName); } } @@ -1729,42 +1729,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Equals extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("EqOperator.java") public void testEqOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/EqOperator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/EqOperator.java"); doTest(fileName); } @TestMetadata("Equals1.java") public void testEquals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals1.java"); doTest(fileName); } @TestMetadata("Equals2.java") public void testEquals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals2.java"); doTest(fileName); } @TestMetadata("Equals3.java") public void testEquals3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals3.java"); doTest(fileName); } @TestMetadata("Equals4.java") public void testEquals4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals4.java"); doTest(fileName); } @TestMetadata("ObjectsEquals.java") public void testObjectsEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/ObjectsEquals.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/ObjectsEquals.java"); doTest(fileName); } } @@ -1774,78 +1774,78 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Field extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classChildExtendsBase.java") public void testClassChildExtendsBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/classChildExtendsBase.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/classChildExtendsBase.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/conversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/conversion.java"); doTest(fileName); } @TestMetadata("internalField.java") public void testInternalField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/internalField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/internalField.java"); doTest(fileName); } @TestMetadata("privateField.java") public void testPrivateField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/privateField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/privateField.java"); doTest(fileName); } @TestMetadata("protectedField.java") public void testProtectedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/protectedField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/protectedField.java"); doTest(fileName); } @TestMetadata("publicField.java") public void testPublicField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/publicField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/publicField.java"); doTest(fileName); } @TestMetadata("specifyType.java") public void testSpecifyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/specifyType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/specifyType.java"); doTest(fileName); } @TestMetadata("valOrVar.java") public void testValOrVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valOrVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valOrVar.java"); doTest(fileName); } @TestMetadata("valWithInit.java") public void testValWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valWithInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valWithInit.java"); doTest(fileName); } @TestMetadata("varWithInit.java") public void testVarWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithInit.java"); doTest(fileName); } @TestMetadata("varWithoutInit.java") public void testVarWithoutInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithoutInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithoutInit.java"); doTest(fileName); } @TestMetadata("volatileTransientAndStrictFp.java") public void testVolatileTransientAndStrictFp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); doTest(fileName); } } @@ -1855,252 +1855,252 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class For extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayIndicesReversed.java") public void testArrayIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/arrayIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/arrayIndicesReversed.java"); doTest(fileName); } @TestMetadata("commonCaseForTest.java") public void testCommonCaseForTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/commonCaseForTest.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/commonCaseForTest.java"); doTest(fileName); } @TestMetadata("downTo1.java") public void testDownTo1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo1.java"); doTest(fileName); } @TestMetadata("downTo2.java") public void testDownTo2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo2.java"); doTest(fileName); } @TestMetadata("downTo3.java") public void testDownTo3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo3.java"); doTest(fileName); } @TestMetadata("downTo4.java") public void testDownTo4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo4.java"); doTest(fileName); } @TestMetadata("falseArrayIndicesReversed.java") public void testFalseArrayIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed.java"); doTest(fileName); } @TestMetadata("falseArrayIndicesReversed2.java") public void testFalseArrayIndicesReversed2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.java"); doTest(fileName); } @TestMetadata("falseForRange.java") public void testFalseForRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseForRange.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseForRange.java"); doTest(fileName); } @TestMetadata("falseIndicesReversed.java") public void testFalseIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseIndicesReversed.java"); doTest(fileName); } @TestMetadata("forRangeWithBlock.java") public void testForRangeWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithBlock.java"); doTest(fileName); } @TestMetadata("forRangeWithLE.java") public void testForRangeWithLE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLE.java"); doTest(fileName); } @TestMetadata("forRangeWithLT.java") public void testForRangeWithLT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT.java"); doTest(fileName); } @TestMetadata("forRangeWithLT2.java") public void testForRangeWithLT2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT2.java"); doTest(fileName); } @TestMetadata("forRangeWithNE.java") public void testForRangeWithNE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithNE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithNE.java"); doTest(fileName); } @TestMetadata("forThroughArrayIndices.java") public void testForThroughArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughArrayIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughCollectionIndices.java") public void testForThroughCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughCollectionIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughCollectionIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndices.java") public void testForThroughListIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndicesNE.java") public void testForThroughListIndicesNE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndicesNE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndicesNE.java"); doTest(fileName); } @TestMetadata("forThroughNonArrayIndices.java") public void testForThroughNonArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonArrayIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonCollectionIndices.java") public void testForThroughNonCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); doTest(fileName); } @TestMetadata("forWithBlock.java") public void testForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlock.java"); doTest(fileName); } @TestMetadata("forWithBlockAndDoubleUpdate.java") public void testForWithBlockAndDoubleUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); doTest(fileName); } @TestMetadata("forWithEmptyBlock.java") public void testForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("forWithExpression.java") public void testForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithExpression.java"); doTest(fileName); } @TestMetadata("forWithNullCondition.java") public void testForWithNullCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullCondition.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullCondition.java"); doTest(fileName); } @TestMetadata("forWithNullInit.java") public void testForWithNullInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullInit.java"); doTest(fileName); } @TestMetadata("forWithNullUpdate.java") public void testForWithNullUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullUpdate.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullUpdate.java"); doTest(fileName); } @TestMetadata("forWithReturn.java") public void testForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithReturn.java"); doTest(fileName); } @TestMetadata("indicesReversed.java") public void testIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java"); doTest(fileName); } @TestMetadata("infiniteFor.java") public void testInfiniteFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/infiniteFor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/infiniteFor.java"); doTest(fileName); } @TestMetadata("nameConflict1.java") public void testNameConflict1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict1.java"); doTest(fileName); } @TestMetadata("nameConflict2.java") public void testNameConflict2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict2.java"); doTest(fileName); } @TestMetadata("nameConflict3.java") public void testNameConflict3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict3.java"); doTest(fileName); } @TestMetadata("nameConflict4.java") public void testNameConflict4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict4.java"); doTest(fileName); } @TestMetadata("nameConflict5.java") public void testNameConflict5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict5.java"); doTest(fileName); } @TestMetadata("notInBlock.java") public void testNotInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/notInBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/notInBlock.java"); doTest(fileName); } @TestMetadata("withContinue1.java") public void testWithContinue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue1.java"); doTest(fileName); } @TestMetadata("withContinue2.java") public void testWithContinue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue2.java"); doTest(fileName); } @TestMetadata("withContinue3.java") public void testWithContinue3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue3.java"); doTest(fileName); } @TestMetadata("withContinueAndLabels.java") public void testWithContinueAndLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinueAndLabels.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinueAndLabels.java"); doTest(fileName); } } @@ -2110,36 +2110,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ForeachStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInForeachStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("enhancedForWithBlock.java") public void testEnhancedForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithEmptyBlock.java") public void testEnhancedForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithExpression.java") public void testEnhancedForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); doTest(fileName); } @TestMetadata("enhancedForWithReturn.java") public void testEnhancedForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); doTest(fileName); } @TestMetadata("nullableIterable.java") public void testNullableIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java"); doTest(fileName); } } @@ -2149,36 +2149,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Formatting extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFormatting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("lineBreaksBetweenArguments.java") public void testLineBreaksBetweenArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.java"); doTest(fileName); } @TestMetadata("nonStaticMembers.java") public void testNonStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembers.java"); doTest(fileName); } @TestMetadata("nonStaticMembersWithComments.java") public void testNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticAndNonStaticMembersWithComments.java") public void testStaticAndNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticMembersWithComments.java") public void testStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticMembersWithComments.java"); doTest(fileName); } } @@ -2189,209 +2189,209 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class Function extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstractMethod.java") public void testAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/abstractMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/abstractMethod.java"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classGenericParam.java") public void testClassGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/classGenericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/classGenericParam.java"); doTest(fileName); } @TestMetadata("emptyVoidMethod.java") public void testEmptyVoidMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/emptyVoidMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/emptyVoidMethod.java"); doTest(fileName); } @TestMetadata("extendsBaseWhichExtendsObject.java") public void testExtendsBaseWhichExtendsObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); doTest(fileName); } @TestMetadata("final.java") public void testFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/final.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/final.java"); doTest(fileName); } @TestMetadata("functionInFinalClass.java") public void testFunctionInFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/functionInFinalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/functionInFinalClass.java"); doTest(fileName); } @TestMetadata("internal.java") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/internal.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/internal.java"); doTest(fileName); } @TestMetadata("java8Lambdas.java") public void testJava8Lambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8Lambdas.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8Lambdas.java"); doTest(fileName); } @TestMetadata("java8MRKFunctionExpectedType.java") public void testJava8MRKFunctionExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.java"); doTest(fileName); } @TestMetadata("java8MRSamConstructor.java") public void testJava8MRSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRSamConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRSamConstructor.java"); doTest(fileName); } @TestMetadata("lineBreaksBetweenParameters.java") public void testLineBreaksBetweenParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.java"); doTest(fileName); } @TestMetadata("main.java") public void testMain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main.java"); doTest(fileName); } @TestMetadata("main2.java") public void testMain2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main2.java"); doTest(fileName); } @TestMetadata("mainAndNullabilitySetting.java") public void testMainAndNullabilitySetting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java"); doTest(fileName); } @TestMetadata("methodClassType.java") public void testMethodClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodClassType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodClassType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType.java") public void testMethodPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType2.java") public void testMethodPrimitiveType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType2.java"); doTest(fileName); } @TestMetadata("methodWithReturnStatement.java") public void testMethodWithReturnStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodWithReturnStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodWithReturnStatement.java"); doTest(fileName); } @TestMetadata("open.java") public void testOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/open.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/open.java"); doTest(fileName); } @TestMetadata("override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/override.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/override.java"); doTest(fileName); } @TestMetadata("overrideAndOpen.java") public void testOverrideAndOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideAndOpen.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideAndOpen.java"); doTest(fileName); } @TestMetadata("overrideObject.java") public void testOverrideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject.java"); doTest(fileName); } @TestMetadata("overrideObject2.java") public void testOverrideObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject2.java"); doTest(fileName); } @TestMetadata("overrideObject3.java") public void testOverrideObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject3.java"); doTest(fileName); } @TestMetadata("overrideWithHigherVisibility.java") public void testOverrideWithHigherVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideWithHigherVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideWithHigherVisibility.java"); doTest(fileName); } @TestMetadata("ownGenericParam.java") public void testOwnGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownGenericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownGenericParam.java"); doTest(fileName); } @TestMetadata("ownSeveralGenericParams.java") public void testOwnSeveralGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownSeveralGenericParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownSeveralGenericParams.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/parameterModification.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/parameterModification.java"); doTest(fileName); } @TestMetadata("private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/private.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/private.java"); doTest(fileName); } @TestMetadata("protected.java") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/protected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/protected.java"); doTest(fileName); } @TestMetadata("public.java") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/public.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/public.java"); doTest(fileName); } @TestMetadata("synchronizedMethod.java") public void testSynchronizedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/synchronizedMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/synchronizedMethod.java"); doTest(fileName); } @TestMetadata("throws.java") public void testThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/throws.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/throws.java"); doTest(fileName); } @TestMetadata("varVararg.java") public void testVarVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/varVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/varVararg.java"); doTest(fileName); } } @@ -2401,24 +2401,24 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Identifier extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIdentifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("finalFieldReference.java") public void testFinalFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/finalFieldReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/finalFieldReference.java"); doTest(fileName); } @TestMetadata("keywords.java") public void testKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/keywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/keywords.java"); doTest(fileName); } @TestMetadata("withDollar.java") public void testWithDollar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/withDollar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/withDollar.java"); doTest(fileName); } } @@ -2428,42 +2428,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class IfStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIfStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("elseIf.java") public void testElseIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/elseIf.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/elseIf.java"); doTest(fileName); } @TestMetadata("multiLine.java") public void testMultiLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java"); doTest(fileName); } @TestMetadata("singleLine.java") public void testSingleLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/singleLine.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/singleLine.java"); doTest(fileName); } @TestMetadata("withBlocks.java") public void testWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withBlocks.java"); doTest(fileName); } @TestMetadata("withEmptyBlocks.java") public void testWithEmptyBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); doTest(fileName); } @TestMetadata("withoutElse.java") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withoutElse.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withoutElse.java"); doTest(fileName); } } @@ -2473,36 +2473,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ImportStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInImportStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("importWithKeywords.java") public void testImportWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithKeywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithKeywords.java"); doTest(fileName); } @TestMetadata("importWithStar.java") public void testImportWithStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithStar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithStar.java"); doTest(fileName); } @TestMetadata("oneImport.java") public void testOneImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/oneImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/oneImport.java"); doTest(fileName); } @TestMetadata("onlyImports.java") public void testOnlyImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/onlyImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/onlyImports.java"); doTest(fileName); } @TestMetadata("simpleImport.java") public void testSimpleImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/simpleImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/simpleImport.java"); doTest(fileName); } } @@ -2512,36 +2512,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Inheritance extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classOneExtendsBaseGeneric.java") public void testClassOneExtendsBaseGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithOneParam.java") public void testClassOneExtendsBaseWithOneParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParams.java") public void testClassOneExtendsBaseWithZeroParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java") public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); doTest(fileName); } @TestMetadata("openModifier.java") public void testOpenModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/openModifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/openModifier.java"); doTest(fileName); } } @@ -2551,18 +2551,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class IsOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIsOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExpression.java") public void testComplicatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/complicatedExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/complicatedExpression.java"); doTest(fileName); } @TestMetadata("simpleReference.java") public void testSimpleReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/simpleReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/simpleReference.java"); doTest(fileName); } } @@ -2572,228 +2572,228 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Issues extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInIssues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayLength.java") public void testArrayLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/arrayLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/arrayLength.java"); doTest(fileName); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/comments.java"); doTest(fileName); } @TestMetadata("doNotQualifyStatic.java") public void testDoNotQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/doNotQualifyStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/doNotQualifyStatic.java"); doTest(fileName); } @TestMetadata("kt-1016.java") public void testKt_1016() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1016.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1016.java"); doTest(fileName); } @TestMetadata("kt-1048.java") public void testKt_1048() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1048.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1048.java"); doTest(fileName); } @TestMetadata("kt-1074.java") public void testKt_1074() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1074.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1074.java"); doTest(fileName); } @TestMetadata("kt-5294.java") public void testKt_5294() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5294.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5294.java"); doTest(fileName); } @TestMetadata("kt-5400.java") public void testKt_5400() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5400.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5400.java"); doTest(fileName); } @TestMetadata("kt-543.java") public void testKt_543() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543.java"); doTest(fileName); } @TestMetadata("kt-543-boxed.java") public void testKt_543_boxed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-boxed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-boxed.java"); doTest(fileName); } @TestMetadata("kt-543-mixed.java") public void testKt_543_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-mixed.java"); doTest(fileName); } @TestMetadata("kt-638.java") public void testKt_638() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-638.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-638.java"); doTest(fileName); } @TestMetadata("kt-696.java") public void testKt_696() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java"); doTest(fileName); } @TestMetadata("kt-792.java") public void testKt_792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792.java"); doTest(fileName); } @TestMetadata("kt-792-mixed.java") public void testKt_792_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792-mixed.java"); doTest(fileName); } @TestMetadata("kt-794.java") public void testKt_794() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794.java"); doTest(fileName); } @TestMetadata("kt-794-mixed.java") public void testKt_794_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794-mixed.java"); doTest(fileName); } @TestMetadata("kt-807.java") public void testKt_807() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-807.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-807.java"); doTest(fileName); } @TestMetadata("kt-809.java") public void testKt_809() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809.java"); doTest(fileName); } @TestMetadata("kt-809-string.java") public void testKt_809_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809-string.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809-string.java"); doTest(fileName); } @TestMetadata("kt-820.java") public void testKt_820() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820.java"); doTest(fileName); } @TestMetadata("kt-820-field.java") public void testKt_820_field() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-field.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-field.java"); doTest(fileName); } @TestMetadata("kt-820-string.java") public void testKt_820_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-string.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-string.java"); doTest(fileName); } @TestMetadata("kt-824.java") public void testKt_824() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824.java"); doTest(fileName); } @TestMetadata("kt-824-isDir.java") public void testKt_824_isDir() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824-isDir.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824-isDir.java"); doTest(fileName); } @TestMetadata("kt-828.java") public void testKt_828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-828.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-828.java"); doTest(fileName); } @TestMetadata("kt-836.java") public void testKt_836() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-836.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-836.java"); doTest(fileName); } @TestMetadata("kt-837.java") public void testKt_837() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-837.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-837.java"); doTest(fileName); } @TestMetadata("kt-851.java") public void testKt_851() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-851.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-851.java"); doTest(fileName); } @TestMetadata("kt-852.java") public void testKt_852() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-852.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-852.java"); doTest(fileName); } @TestMetadata("kt-871.java") public void testKt_871() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-871.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-871.java"); doTest(fileName); } @TestMetadata("kt-879.java") public void testKt_879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-879.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-879.java"); doTest(fileName); } @TestMetadata("kt-893.java") public void testKt_893() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-893.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-893.java"); doTest(fileName); } @TestMetadata("kt-899.java") public void testKt_899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-899.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-899.java"); doTest(fileName); } @TestMetadata("kt-963.java") public void testKt_963() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-963.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-963.java"); doTest(fileName); } @TestMetadata("qualifyStatic.java") public void testQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/qualifyStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/qualifyStatic.java"); doTest(fileName); } @TestMetadata("spaceBeforeAssignment.java") public void testSpaceBeforeAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/spaceBeforeAssignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/spaceBeforeAssignment.java"); doTest(fileName); } } @@ -2803,84 +2803,84 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class KotlinApiAccess extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInKotlinApiAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassObjectMembers.java") public void testClassObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); doTest(fileName); } @TestMetadata("CorrectFunNullabilityDetected.java") public void testCorrectFunNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); doTest(fileName); } @TestMetadata("CorrectNullabilityDetected.java") public void testCorrectNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); doTest(fileName); } @TestMetadata("ExtensionFunction.java") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); doTest(fileName); } @TestMetadata("ExtensionProperty.java") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); doTest(fileName); } @TestMetadata("GlobalFunction.java") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); doTest(fileName); } @TestMetadata("GlobalGenericFunction.java") public void testGlobalGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); doTest(fileName); } @TestMetadata("GlobalValue1.java") public void testGlobalValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); doTest(fileName); } @TestMetadata("GlobalValue2.java") public void testGlobalValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); doTest(fileName); } @TestMetadata("InheritedProperty.java") public void testInheritedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); doTest(fileName); } @TestMetadata("ObjectMembers.java") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); doTest(fileName); } @TestMetadata("Property.java") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property.java"); doTest(fileName); } @TestMetadata("Property2.java") public void testProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property2.java"); doTest(fileName); } } @@ -2890,12 +2890,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LabelStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLabelStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExampleFromJavaTutorial.java") public void testComplicatedExampleFromJavaTutorial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); doTest(fileName); } } @@ -2905,18 +2905,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class List extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ForEach.java") public void testForEach() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/ForEach.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/ForEach.java"); doTest(fileName); } @TestMetadata("Lists.java") public void testLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/Lists.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/Lists.java"); doTest(fileName); } } @@ -2926,60 +2926,60 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LiteralExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLiteralExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("char.java") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/char.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/char.java"); doTest(fileName); } @TestMetadata("dollarInsideString.java") public void testDollarInsideString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/dollarInsideString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/dollarInsideString.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/double.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/double.java"); doTest(fileName); } @TestMetadata("endsWithDFL.java") public void testEndsWithDFL() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/endsWithDFL.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/endsWithDFL.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/float.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/float.java"); doTest(fileName); } @TestMetadata("hex.java") public void testHex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/hex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/hex.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/long.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/long.java"); doTest(fileName); } @TestMetadata("octal.java") public void testOctal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/octal.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/octal.java"); doTest(fileName); } @TestMetadata("trueOrFalse.java") public void testTrueOrFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/trueOrFalse.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/trueOrFalse.java"); doTest(fileName); } } @@ -2989,60 +2989,60 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LocalVariable extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInLocalVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoBangBang.java") public void testAutoBangBang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/autoBangBang.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/autoBangBang.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/conversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/conversion.java"); doTest(fileName); } @TestMetadata("literalConversion.java") public void testLiteralConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/literalConversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/literalConversion.java"); doTest(fileName); } @TestMetadata("nullIInitializer.java") public void testNullIInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/nullIInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/nullIInitializer.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/object.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/object.java"); doTest(fileName); } @TestMetadata("unboxing.java") public void testUnboxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/unboxing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/unboxing.java"); doTest(fileName); } @TestMetadata("valTypeDoNotMatch.java") public void testValTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varTypeDoNotMatch.java") public void testVarTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varWithNoInitializer.java") public void testVarWithNoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varWithNoInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varWithNoInitializer.java"); doTest(fileName); } } @@ -3052,78 +3052,78 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class MethodCallExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInMethodCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("callWithKeywords.java") public void testCallWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); doTest(fileName); } @TestMetadata("collectionsMethods.java") public void testCollectionsMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); doTest(fileName); } @TestMetadata("collectionsMethods2.java") public void testCollectionsMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); doTest(fileName); } @TestMetadata("emptyCall.java") public void testEmptyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/emptyCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/emptyCall.java"); doTest(fileName); } @TestMetadata("genericMethod.java") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/genericMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/genericMethod.java"); doTest(fileName); } @TestMetadata("getClass.java") public void testGetClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/getClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/getClass.java"); doTest(fileName); } @TestMetadata("simpleCall.java") public void testSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/simpleCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/simpleCall.java"); doTest(fileName); } @TestMetadata("specialBuiltinMembers.java") public void testSpecialBuiltinMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/specialBuiltinMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/specialBuiltinMembers.java"); doTest(fileName); } @TestMetadata("stringMethods.java") public void testStringMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/stringMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/stringMethods.java"); doTest(fileName); } @TestMetadata("systemOut.java") public void testSystemOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); doTest(fileName); } @TestMetadata("vararg1.java") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java"); doTest(fileName); } @TestMetadata("vararg2.java") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg2.java"); doTest(fileName); } } @@ -3133,42 +3133,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Misc extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("packageWithClass.java") public void testPackageWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClass.java"); doTest(fileName); } @TestMetadata("packageWithClasses.java") public void testPackageWithClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClasses.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClasses.java"); doTest(fileName); } @TestMetadata("packageWithImports.java") public void testPackageWithImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithImports.java"); doTest(fileName); } @TestMetadata("packageWithMixedImports.java") public void testPackageWithMixedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithMixedImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithMixedImports.java"); doTest(fileName); } @TestMetadata("packageWithOpenClass.java") public void testPackageWithOpenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithOpenClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithOpenClass.java"); doTest(fileName); } @TestMetadata("packageWithStaticImports.java") public void testPackageWithStaticImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithStaticImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithStaticImports.java"); doTest(fileName); } } @@ -3178,42 +3178,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class MutableCollections extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInMutableCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/mutableCollections"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/mutableCollections"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("FunctionParameters.java") public void testFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters.java"); doTest(fileName); } @TestMetadata("FunctionParameters2.java") public void testFunctionParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.java"); doTest(fileName); } @TestMetadata("FunctionReturnValue.java") public void testFunctionReturnValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.java"); doTest(fileName); } @TestMetadata("FunctionReturnValue2.java") public void testFunctionReturnValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Overrides.java"); doTest(fileName); } @TestMetadata("Recursion.java") public void testRecursion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Recursion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Recursion.java"); doTest(fileName); } } @@ -3223,90 +3223,90 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class NewClassExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInNewClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classWithParam.java") public void testClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParam.java"); doTest(fileName); } @TestMetadata("classWithParams.java") public void testClassWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParams.java"); doTest(fileName); } @TestMetadata("classWithoutBody.java") public void testClassWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithoutBody.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithoutBody.java"); doTest(fileName); } @TestMetadata("fullQualifiedName.java") public void testFullQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); doTest(fileName); } @TestMetadata("fullQualifiedName2.java") public void testFullQualifiedName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); doTest(fileName); } @TestMetadata("genericClassInvocation.java") public void testGenericClassInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); doTest(fileName); } @TestMetadata("lineBreaks.java") public void testLineBreaks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/lineBreaks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/lineBreaks.java"); doTest(fileName); } @TestMetadata("newAnonymousClass.java") public void testNewAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); doTest(fileName); } @TestMetadata("newAnonymousClass2.java") public void testNewAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); doTest(fileName); } @TestMetadata("newAnonymousClass3.java") public void testNewAnonymousClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); doTest(fileName); } @TestMetadata("newClassByFullName.java") public void testNewClassByFullName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newClassByFullName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newClassByFullName.java"); doTest(fileName); } @TestMetadata("newInnerClass.java") public void testNewInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newInnerClass.java"); doTest(fileName); } @TestMetadata("newListAndNewMember.java") public void testNewListAndNewMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); doTest(fileName); } @TestMetadata("newStaticInnerClass.java") public void testNewStaticInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); doTest(fileName); } } @@ -3316,186 +3316,186 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Nullability extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInNullability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoNotNull.java") public void testAutoNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/autoNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/autoNotNull.java"); doTest(fileName); } @TestMetadata("FieldAssignedWithNull.java") public void testFieldAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull.java") public void testFieldComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull2.java") public void testFieldComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull3.java") public void testFieldComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull4.java") public void testFieldComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); doTest(fileName); } @TestMetadata("FieldInitializedWithNull.java") public void testFieldInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); doTest(fileName); } @TestMetadata("IndirectOverride.java") public void testIndirectOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/IndirectOverride.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/IndirectOverride.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg.java") public void testMethodInvokedWithNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg2.java") public void testMethodInvokedWithNullArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithTernaryNullArg.java") public void testMethodInvokedWithTernaryNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull.java") public void testMethodResultComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull2.java") public void testMethodResultComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull3.java") public void testMethodResultComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull4.java") public void testMethodResultComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); doTest(fileName); } @TestMetadata("MethodResultInitializesNullableField.java") public void testMethodResultInitializesNullableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); doTest(fileName); } @TestMetadata("MethodReturnsNull.java") public void testMethodReturnsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNull.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInAnonymousClass.java") public void testMethodReturnsNullInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInLocalClass.java") public void testMethodReturnsNullInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsTernaryNull.java") public void testMethodReturnsTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); doTest(fileName); } @TestMetadata("NullableIntNoCrash.java") public void testNullableIntNoCrash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableIntNoCrash.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableIntNoCrash.java"); doTest(fileName); } @TestMetadata("NullableMethodDotAccess.java") public void testNullableMethodDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); doTest(fileName); } @TestMetadata("NullableVariableDotAccess.java") public void testNullableVariableDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); doTest(fileName); } @TestMetadata("OverrideWithInheritanceLoop.java") public void testOverrideWithInheritanceLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/Overrides.java"); doTest(fileName); } @TestMetadata("ParameterComparedWithNull.java") public void testParameterComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableAssignedWithNull.java") public void testVariableAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); doTest(fileName); } @TestMetadata("VariableComparedWithNull.java") public void testVariableComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithNull.java") public void testVariableInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithTernaryNull.java") public void testVariableInitializedWithTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); doTest(fileName); } } @@ -3505,12 +3505,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ObjectLiteral extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInObjectLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("MyFrame.java") public void testMyFrame() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/objectLiteral/MyFrame.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/objectLiteral/MyFrame.java"); doTest(fileName); } } @@ -3521,47 +3521,47 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class Overloads extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("Abstract.java") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Abstract.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Abstract.java"); doTest(fileName); } @TestMetadata("AccessorToDrop.java") public void testAccessorToDrop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/AccessorToDrop.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/AccessorToDrop.java"); doTest(fileName); } public void testAllFilesPresentInOverloads() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/overloads"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/overloads"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Annotations.java") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Annotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Annotations.java"); doTest(fileName); } @TestMetadata("Override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Override.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Override.java"); doTest(fileName); } @TestMetadata("Private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Private.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Private.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Simple.java"); doTest(fileName); } @TestMetadata("Synchronized.java") public void testSynchronized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Synchronized.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Synchronized.java"); doTest(fileName); } } @@ -3571,12 +3571,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PackageStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPackageStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("keywordInPackageName.java") public void testKeywordInPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); doTest(fileName); } } @@ -3586,18 +3586,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInParenthesizedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("parenthesized.java") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); doTest(fileName); } @TestMetadata("parenthesized2.java") public void testParenthesized2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); doTest(fileName); } } @@ -3607,42 +3607,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PolyadicExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPolyadicExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/divide.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/divide.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/minus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/minus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/multiply.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/multiply.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/plus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/remainder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/remainder.java"); doTest(fileName); } @TestMetadata("unassignedShiftRight.java") public void testUnassignedShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); doTest(fileName); } } @@ -3652,60 +3652,60 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PostProcessing extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPostProcessing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnonymousObject.java") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/AnonymousObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/AnonymousObject.java"); doTest(fileName); } @TestMetadata("GetOperator.java") public void testGetOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); doTest(fileName); } @TestMetadata("IfNullReturnToElvis.java") public void testIfNullReturnToElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); doTest(fileName); } @TestMetadata("IfToElvis.java") public void testIfToElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); doTest(fileName); } @TestMetadata("IfToSafeCall.java") public void testIfToSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); doTest(fileName); } @TestMetadata("NotIs.java") public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); doTest(fileName); } @TestMetadata("RedundantTypeCast.java") public void testRedundantTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); doTest(fileName); } @TestMetadata("RedundantTypeCastAndInline.java") public void testRedundantTypeCastAndInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); doTest(fileName); } @TestMetadata("SyntheticExtensionPropertyAccess.java") public void testSyntheticExtensionPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); doTest(fileName); } } @@ -3715,18 +3715,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PostfixOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPostfixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/decrement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/decrement.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/increment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/increment.java"); doTest(fileName); } } @@ -3736,42 +3736,42 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PrefixOperator extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInPrefixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/decrement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/decrement.java"); doTest(fileName); } @TestMetadata("excl.java") public void testExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/excl.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/excl.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/increment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/increment.java"); doTest(fileName); } @TestMetadata("kt-667.java") public void testKt_667() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/kt-667.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/kt-667.java"); doTest(fileName); } @TestMetadata("nullableIf.java") public void testNullableIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/nullableIf.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/nullableIf.java"); doTest(fileName); } @TestMetadata("tilde.java") public void testTilde() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/tilde.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/tilde.java"); doTest(fileName); } } @@ -3781,12 +3781,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Projections extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInProjections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("projections.java") public void testProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java"); doTest(fileName); } } @@ -3796,36 +3796,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class RawGenerics extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInRawGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("cycle.java") public void testCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/cycle.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/cycle.java"); doTest(fileName); } @TestMetadata("kt-540.java") public void testKt_540() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540.java"); doTest(fileName); } @TestMetadata("kt-540-map.java") public void testKt_540_map() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-map.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-map.java"); doTest(fileName); } @TestMetadata("kt-540-rawGenericClass.java") public void testKt_540_rawGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); doTest(fileName); } @TestMetadata("rawGenericMethod.java") public void testRawGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); doTest(fileName); } } @@ -3835,36 +3835,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ReturnStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInReturnStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("currentMethodBug.java") public void testCurrentMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/currentMethodBug.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/currentMethodBug.java"); doTest(fileName); } @TestMetadata("returnChar.java") public void testReturnChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnChar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnChar.java"); doTest(fileName); } @TestMetadata("returnLiteral.java") public void testReturnLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnLiteral.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnLiteral.java"); doTest(fileName); } @TestMetadata("returnNumber.java") public void testReturnNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnNumber.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnNumber.java"); doTest(fileName); } @TestMetadata("returnString.java") public void testReturnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnString.java"); doTest(fileName); } } @@ -3874,30 +3874,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Settings extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSettings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("openByDefault.java") public void testOpenByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/openByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/openByDefault.java"); doTest(fileName); } @TestMetadata("specifyFieldTypeByDefault.java") public void testSpecifyFieldTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefault.java") public void testSpecifyLocalVariableTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefaultInFor.java") public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); doTest(fileName); } } @@ -3907,36 +3907,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PrivateStaticMembers.java") public void testPrivateStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods1.java") public void testPrivateStaticMethods1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods2.java") public void testPrivateStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods3.java") public void testPrivateStaticMethods3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods4.java") public void testPrivateStaticMethods4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); doTest(fileName); } } @@ -3946,24 +3946,24 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class SuperExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSuperExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotSuperFoo.java") public void testClassAdotSuperFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); doTest(fileName); } @TestMetadata("classAextendsB.java") public void testClassAextendsB() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAextendsB.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAextendsB.java"); doTest(fileName); } @TestMetadata("superStatement.java") public void testSuperStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/superStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/superStatement.java"); doTest(fileName); } } @@ -3973,72 +3973,72 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Switch extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSwitch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("caseWithBlock.java") public void testCaseWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/caseWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/caseWithBlock.java"); doTest(fileName); } @TestMetadata("comlicatedFallDown.java") public void testComlicatedFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/comlicatedFallDown.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/comlicatedFallDown.java"); doTest(fileName); } @TestMetadata("continueAndBreakWithLabel.java") public void testContinueAndBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); doTest(fileName); } @TestMetadata("emptySwitch.java") public void testEmptySwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/emptySwitch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/emptySwitch.java"); doTest(fileName); } @TestMetadata("enumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/enumConstants.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/enumConstants.java"); doTest(fileName); } @TestMetadata("fallDown.java") public void testFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDown.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDown.java"); doTest(fileName); } @TestMetadata("fallDownWithBlocks.java") public void testFallDownWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDownWithBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDownWithBlocks.java"); doTest(fileName); } @TestMetadata("invalidSwitch.java") public void testInvalidSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/invalidSwitch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/invalidSwitch.java"); doTest(fileName); } @TestMetadata("kt-539.java") public void testKt_539() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/kt-539.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/kt-539.java"); doTest(fileName); } @TestMetadata("nondefault.java") public void testNondefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/nondefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/nondefault.java"); doTest(fileName); } @TestMetadata("returnsAndThrows.java") public void testReturnsAndThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/returnsAndThrows.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/returnsAndThrows.java"); doTest(fileName); } } @@ -4048,12 +4048,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class SynchronizedStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInSynchronizedStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("singleLineExample.java") public void testSingleLineExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); doTest(fileName); } } @@ -4063,18 +4063,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ThisExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInThisExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotThisFoo.java") public void testClassAdotThisFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); doTest(fileName); } @TestMetadata("thisStatement.java") public void testThisStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/thisStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/thisStatement.java"); doTest(fileName); } } @@ -4084,12 +4084,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ThrowStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInThrowStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("simpleThrowStatement.java") public void testSimpleThrowStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); doTest(fileName); } } @@ -4099,30 +4099,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ToKotlinClasses extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInToKotlinClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("iterableAndIterator.java") public void testIterableAndIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); doTest(fileName); } @TestMetadata("iterableAndIterator2.java") public void testIterableAndIterator2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); doTest(fileName); } @TestMetadata("iterableAndIterator3.java") public void testIterableAndIterator3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); doTest(fileName); } @TestMetadata("TypeParameterBound.java") public void testTypeParameterBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); doTest(fileName); } } @@ -4133,71 +4133,71 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo public static class Trait extends AbstractJavaToKotlinConverterForWebDemoTest { @TestMetadata("abstactInterface.java") public void testAbstactInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/abstactInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/abstactInterface.java"); doTest(fileName); } public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("emptyInterface.java") public void testEmptyInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/emptyInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/emptyInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("extendsOneInterface.java") public void testExtendsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneInterface.java"); doTest(fileName); } @TestMetadata("interfaceWithFields.java") public void testInterfaceWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithFields.java"); doTest(fileName); } @TestMetadata("interfaceWithMethodDeclaration.java") public void testInterfaceWithMethodDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); doTest(fileName); } @TestMetadata("interfaceWithStaticFields.java") public void testInterfaceWithStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithStaticFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithStaticFields.java"); doTest(fileName); } @TestMetadata("internalInterface.java") public void testInternalInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/internalInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/internalInterface.java"); doTest(fileName); } @TestMetadata("privateInterface.java") public void testPrivateInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/privateInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/privateInterface.java"); doTest(fileName); } @TestMetadata("protectedInterface.java") public void testProtectedInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/protectedInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/protectedInterface.java"); doTest(fileName); } @TestMetadata("publicInterface.java") public void testPublicInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/publicInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/publicInterface.java"); doTest(fileName); } } @@ -4207,36 +4207,36 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TryStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTryStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTryStatement.java") public void testCommonCaseForTryStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); doTest(fileName); } @TestMetadata("disjunctionType.java") public void testDisjunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/disjunctionType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/disjunctionType.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java") public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithFinally.java") public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java") public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); doTest(fileName); } } @@ -4246,66 +4246,66 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TryWithResource extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTryWithResource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Multiline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Multiline.java"); doTest(fileName); } @TestMetadata("MultipleResources.java") public void testMultipleResources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/MultipleResources.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/MultipleResources.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Simple.java"); doTest(fileName); } @TestMetadata("WithCatch.java") public void testWithCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatch.java"); doTest(fileName); } @TestMetadata("WithCatchAndFinally.java") public void testWithCatchAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); doTest(fileName); } @TestMetadata("WithCatches.java") public void testWithCatches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatches.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatches.java"); doTest(fileName); } @TestMetadata("WithFinally.java") public void testWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithFinally.java"); doTest(fileName); } @TestMetadata("WithReturnAtEnd.java") public void testWithReturnAtEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass.java") public void testWithReturnInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass2.java") public void testWithReturnInAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); doTest(fileName); } } @@ -4315,60 +4315,60 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TypeCastExpression extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTypeCastExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("castNullable.java") public void testCastNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/castNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/castNullable.java"); doTest(fileName); } @TestMetadata("extendsWildcardCast.java") public void testExtendsWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); doTest(fileName); } @TestMetadata("fooCast.java") public void testFooCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/fooCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/fooCast.java"); doTest(fileName); } @TestMetadata("intCast.java") public void testIntCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/intCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/intCast.java"); doTest(fileName); } @TestMetadata("primitiveType.java") public void testPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/primitiveType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/primitiveType.java"); doTest(fileName); } @TestMetadata("simpleGenericCast.java") public void testSimpleGenericCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); doTest(fileName); } @TestMetadata("stringCast.java") public void testStringCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/stringCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/stringCast.java"); doTest(fileName); } @TestMetadata("superWildcardCast.java") public void testSuperWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); doTest(fileName); } @TestMetadata("wildcardCast.java") public void testWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/wildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/wildcardCast.java"); doTest(fileName); } } @@ -4378,96 +4378,96 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java") public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBounds.java") public void testClassParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java") public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassExtending.java") public void testComplexExampleWithClassExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassMultiplyExtending.java") public void testComplexExampleWithClassMultiplyExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericClass.java"); doTest(fileName); } @TestMetadata("genericParam.java") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam.java"); doTest(fileName); } @TestMetadata("genericParam-settings.java") public void testGenericParam_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam-settings.java"); doTest(fileName); } @TestMetadata("manyGenericParams.java") public void testManyGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/manyGenericParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/manyGenericParams.java"); doTest(fileName); } @TestMetadata("methodDoubleParametrizationWithTwoBounds.java") public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("needTypeArgs.java") public void testNeedTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/needTypeArgs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/needTypeArgs.java"); doTest(fileName); } @TestMetadata("rawTypeCast.java") public void testRawTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/rawTypeCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/rawTypeCast.java"); doTest(fileName); } @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java") public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("typeFromOtherFile.java") public void testTypeFromOtherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); doTest(fileName); } @TestMetadata("where.java") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/where.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/where.java"); doTest(fileName); } } @@ -4477,18 +4477,18 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class VarArg extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInVarArg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ellipsisTypeSeveralParams.java") public void testEllipsisTypeSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); doTest(fileName); } @TestMetadata("ellipsisTypeSingleParams.java") public void testEllipsisTypeSingleParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); doTest(fileName); } } @@ -4498,30 +4498,30 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class WhileStatement extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java"); doTest(fileName); } } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java index 78ee4a2d431..b55af26603e 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,30 +32,30 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterMultiFileTestGenerated extends AbstractJavaToKotlinConverterMultiFileTest { public void testAllFilesPresentInMultiFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/multiFile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/multiFile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("FieldToProperty") public void testFieldToProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/multiFile/FieldToProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/multiFile/FieldToProperty/"); doTest(fileName); } @TestMetadata("GetterAndSetterUsages") public void testGetterAndSetterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/multiFile/GetterAndSetterUsages/"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/multiFile/GetterAndSetterUsages/"); doTest(fileName); } @TestMetadata("ToCompanionObject") public void testToCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/multiFile/ToCompanionObject/"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/multiFile/ToCompanionObject/"); doTest(fileName); } @TestMetadata("ToObject") public void testToObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/multiFile/ToObject/"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/multiFile/ToObject/"); doTest(fileName); } } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 0ad2f3f9de6..32c5191b721 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFileOrElement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("j2k/testData/fileOrElement/annotations") @@ -40,72 +40,72 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/annotations"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("annotationInterface1.java") public void testAnnotationInterface1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface1.java"); doTest(fileName); } @TestMetadata("annotationInterface2.java") public void testAnnotationInterface2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface2.java"); doTest(fileName); } @TestMetadata("annotationInterface3.java") public void testAnnotationInterface3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface3.java"); doTest(fileName); } @TestMetadata("annotationInterface4.java") public void testAnnotationInterface4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationInterface4.java"); doTest(fileName); } @TestMetadata("annotationUsages.java") public void testAnnotationUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationUsages.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/annotationUsages.java"); doTest(fileName); } @TestMetadata("javaClassArgument.java") public void testJavaClassArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArgument.java"); doTest(fileName); } @TestMetadata("javaClassArrayArgument.java") public void testJavaClassArrayArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArrayArgument.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/javaClassArrayArgument.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNull.java") public void testJetbrainsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java"); doTest(fileName); } @TestMetadata("jetbrainsNotNullChainExpr.java") public void testJetbrainsNotNullChainExpr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java"); doTest(fileName); } @TestMetadata("jetbrainsNullable.java") public void testJetbrainsNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/jetbrainsNullable.java"); doTest(fileName); } @TestMetadata("primaryConstructorAnnotation.java") public void testPrimaryConstructorAnnotation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java"); doTest(fileName); } } @@ -115,18 +115,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AnonymousBlock extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAnonymousBlock() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("oneAnonBlock.java") public void testOneAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.java"); doTest(fileName); } @TestMetadata("oneStaticAnonBlock.java") public void testOneStaticAnonBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.java"); doTest(fileName); } } @@ -136,24 +136,24 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayAccessExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("expressionIndex.java") public void testExpressionIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/expressionIndex.java"); doTest(fileName); } @TestMetadata("intIndex.java") public void testIntIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/intIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/intIndex.java"); doTest(fileName); } @TestMetadata("variableIndex.java") public void testVariableIndex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayAccessExpression/variableIndex.java"); doTest(fileName); } } @@ -163,78 +163,78 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayInitializerExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("doubleArray.java") public void testDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArray.java"); doTest(fileName); } @TestMetadata("doubleArrayWithVariables.java") public void testDoubleArrayWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/doubleArrayWithVariables.java"); doTest(fileName); } @TestMetadata("floatArray.java") public void testFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/floatArray.java"); doTest(fileName); } @TestMetadata("intArrayWithLength.java") public void testIntArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/intArrayWithLength.java"); doTest(fileName); } @TestMetadata("javaLangDoubleArray.java") public void testJavaLangDoubleArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangDoubleArray.java"); doTest(fileName); } @TestMetadata("javaLangFloatArray.java") public void testJavaLangFloatArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/javaLangFloatArray.java"); doTest(fileName); } @TestMetadata("newByte.java") public void testNewByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newByte.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newByte.java"); doTest(fileName); } @TestMetadata("newInt.java") public void testNewInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newInt.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/newInt.java"); doTest(fileName); } @TestMetadata("objectArrayWithLength.java") public void testObjectArrayWithLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/objectArrayWithLength.java"); doTest(fileName); } @TestMetadata("oneDim.java") public void testOneDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDim.java"); doTest(fileName); } @TestMetadata("oneDimWithVariables.java") public void testOneDimWithVariables() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/oneDimWithVariables.java"); doTest(fileName); } @TestMetadata("twoDim.java") public void testTwoDim() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayInitializerExpression/twoDim.java"); doTest(fileName); } } @@ -244,66 +244,66 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ArrayType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInArrayType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/arrayType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayInitializationStatement.java") public void testArrayInitializationStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatement.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension.java") public void testArrayInitializationStatementWithDimension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimension3d.java") public void testArrayInitializationStatementWithDimension3d() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.java"); doTest(fileName); } @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java") public void testArrayInitializationStatementWithDimensionExplicit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimensionExplicit.java"); doTest(fileName); } @TestMetadata("d2StringEmptyArray.java") public void testD2StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.java"); doTest(fileName); } @TestMetadata("d3StringEmptyArray.java") public void testD3StringEmptyArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.java"); doTest(fileName); } @TestMetadata("longArray.java") public void testLongArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/longArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/longArray.java"); doTest(fileName); } @TestMetadata("methodArrayArgs.java") public void testMethodArrayArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/methodArrayArgs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/methodArrayArgs.java"); doTest(fileName); } @TestMetadata("newIntArray.java") public void testNewIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newIntArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newIntArray.java"); doTest(fileName); } @TestMetadata("newStringArray.java") public void testNewStringArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newStringArray.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/arrayType/newStringArray.java"); doTest(fileName); } } @@ -313,30 +313,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AssertStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAssertStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("onlyCondition.java") public void testOnlyCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyCondition.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyCondition.java"); doTest(fileName); } @TestMetadata("onlyConditionWithBraces.java") public void testOnlyConditionWithBraces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/onlyConditionWithBraces.java"); doTest(fileName); } @TestMetadata("withStringDetail.java") public void testWithStringDetail() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail.java"); doTest(fileName); } @TestMetadata("withStringDetail2.java") public void testWithStringDetail2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assertStatement/withStringDetail2.java"); doTest(fileName); } } @@ -346,96 +346,96 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class AssignmentExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInAssignmentExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/and.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/and.java"); doTest(fileName); } @TestMetadata("assignment.java") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/assignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/assignment.java"); doTest(fileName); } @TestMetadata("divideAssign.java") public void testDivideAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/divideAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/divideAssign.java"); doTest(fileName); } @TestMetadata("minusAssign.java") public void testMinusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/minusAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/minusAssign.java"); doTest(fileName); } @TestMetadata("multiplyAssign.java") public void testMultiplyAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/multiplyAssign.java"); doTest(fileName); } @TestMetadata("nullability.java") public void testNullability() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability.java"); doTest(fileName); } @TestMetadata("nullability-settings.java") public void testNullability_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/or.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/or.java"); doTest(fileName); } @TestMetadata("plusAssign.java") public void testPlusAssign() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/plusAssign.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/plusAssign.java"); doTest(fileName); } @TestMetadata("reminder.java") public void testReminder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/reminder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/reminder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftLeft.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("simpleAssignment.java") public void testSimpleAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/simpleAssignment.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/xor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/assignmentExpression/xor.java"); doTest(fileName); } } @@ -445,114 +445,114 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BinaryExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBinaryExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("and.java") public void testAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/and.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/and.java"); doTest(fileName); } @TestMetadata("conditionalAnd.java") public void testConditionalAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalAnd.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalAnd.java"); doTest(fileName); } @TestMetadata("conditionalOr.java") public void testConditionalOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalOr.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/conditionalOr.java"); doTest(fileName); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/divide.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/divide.java"); doTest(fileName); } @TestMetadata("greaterThan.java") public void testGreaterThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThan.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThan.java"); doTest(fileName); } @TestMetadata("greaterThanEqual.java") public void testGreaterThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/greaterThanEqual.java"); doTest(fileName); } @TestMetadata("lessThan.java") public void testLessThan() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThan.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThan.java"); doTest(fileName); } @TestMetadata("lessThanEqual.java") public void testLessThanEqual() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThanEqual.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/lessThanEqual.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/minus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/minus.java"); doTest(fileName); } @TestMetadata("multiplePlusMinus.java") public void testMultiplePlusMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiplePlusMinus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiply.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/multiply.java"); doTest(fileName); } @TestMetadata("or.java") public void testOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/or.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/or.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/plus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/remainder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/remainder.java"); doTest(fileName); } @TestMetadata("shiftLeft.java") public void testShiftLeft() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftLeft.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftLeft.java"); doTest(fileName); } @TestMetadata("shiftRight.java") public void testShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/shiftRight.java"); doTest(fileName); } @TestMetadata("unsignedRightShift.java") public void testUnsignedRightShift() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/unsignedRightShift.java"); doTest(fileName); } @TestMetadata("xor.java") public void testXor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/xor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/binaryExpression/xor.java"); doTest(fileName); } } @@ -562,12 +562,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Blocks extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBlocks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/blocks"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Blocks.java") public void testBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/blocks/Blocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/blocks/Blocks.java"); doTest(fileName); } } @@ -577,72 +577,72 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BoxedType extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBoxedType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/boxedType"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("boolean.java") public void testBoolean() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/boolean.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/boolean.java"); doTest(fileName); } @TestMetadata("Boxing.java") public void testBoxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/Boxing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/Boxing.java"); doTest(fileName); } @TestMetadata("byte.java") public void testByte() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/byte.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/byte.java"); doTest(fileName); } @TestMetadata("character.java") public void testCharacter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/character.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/character.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/double.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/double.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/float.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/float.java"); doTest(fileName); } @TestMetadata("integer.java") public void testInteger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/integer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/integer.java"); doTest(fileName); } @TestMetadata("kt-671.java") public void testKt_671() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/kt-671.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/kt-671.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/long.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/long.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/object.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/object.java"); doTest(fileName); } @TestMetadata("short.java") public void testShort() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/short.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/boxedType/short.java"); doTest(fileName); } } @@ -652,18 +652,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class BreakStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInBreakStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("breakWithLabel.java") public void testBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithLabel.java"); doTest(fileName); } @TestMetadata("breakWithoutLabel.java") public void testBreakWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/breakStatement/breakWithoutLabel.java"); doTest(fileName); } } @@ -673,42 +673,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class CallChainExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInCallChainExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("libraryFieldCall.java") public void testLibraryFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCall.java") public void testLibraryMethodCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance.java") public void testLibraryMethodCallFromInstance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.java"); doTest(fileName); } @TestMetadata("libraryMethodCallFromInstance-settings.java") public void testLibraryMethodCallFromInstance_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java"); doTest(fileName); } @TestMetadata("libraryStringFieldCall.java") public void testLibraryStringFieldCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.java"); doTest(fileName); } @TestMetadata("sout.java") public void testSout() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/sout.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/callChainExpression/sout.java"); doTest(fileName); } } @@ -719,197 +719,197 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class Class extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstractClass.java") public void testAbstractClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClass.java"); doTest(fileName); } @TestMetadata("abstractClassShape.java") public void testAbstractClassShape() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClassShape.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/abstractClassShape.java"); doTest(fileName); } public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/class"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("class.java") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/class.java"); doTest(fileName); } @TestMetadata("ClassShadowing.java") public void testClassShadowing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/ClassShadowing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/ClassShadowing.java"); doTest(fileName); } @TestMetadata("classWithEmptyMethods.java") public void testClassWithEmptyMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithEmptyMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithEmptyMethods.java"); doTest(fileName); } @TestMetadata("classWithFields.java") public void testClassWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithFields.java"); doTest(fileName); } @TestMetadata("classWithMultiplyFields.java") public void testClassWithMultiplyFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithMultiplyFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/classWithMultiplyFields.java"); doTest(fileName); } @TestMetadata("emptyClass.java") public void testEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/emptyClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/emptyClass.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsOneInterface.java") public void testExtendsOneClassAndImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("finalClass.java") public void testFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/finalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/finalClass.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/genericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/genericClass.java"); doTest(fileName); } @TestMetadata("innerClassInInterface.java") public void testInnerClassInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerClassInInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerClassInInterface.java"); doTest(fileName); } @TestMetadata("innerEmptyClass.java") public void testInnerEmptyClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEmptyClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEmptyClass.java"); doTest(fileName); } @TestMetadata("innerEnum.java") public void testInnerEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerEnum.java"); doTest(fileName); } @TestMetadata("innerInterface.java") public void testInnerInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerInterface.java"); doTest(fileName); } @TestMetadata("innerStaticClass.java") public void testInnerStaticClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerStaticClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/innerStaticClass.java"); doTest(fileName); } @TestMetadata("internalClass.java") public void testInternalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/internalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/internalClass.java"); doTest(fileName); } @TestMetadata("kt-639.java") public void testKt_639() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/kt-639.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/kt-639.java"); doTest(fileName); } @TestMetadata("notUtilityClass.java") public void testNotUtilityClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/notUtilityClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/notUtilityClass.java"); doTest(fileName); } @TestMetadata("oneStaticFieldOneNonStatic.java") public void testOneStaticFieldOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.java"); doTest(fileName); } @TestMetadata("oneStaticMethod.java") public void testOneStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethod.java"); doTest(fileName); } @TestMetadata("oneStaticMethodOneNonStatic.java") public void testOneStaticMethodOneNonStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.java"); doTest(fileName); } @TestMetadata("pivateClass.java") public void testPivateClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/pivateClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/pivateClass.java"); doTest(fileName); } @TestMetadata("privateInit.java") public void testPrivateInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/privateInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/privateInit.java"); doTest(fileName); } @TestMetadata("protectedClass.java") public void testProtectedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/protectedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/protectedClass.java"); doTest(fileName); } @TestMetadata("publicClass.java") public void testPublicClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/publicClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/publicClass.java"); doTest(fileName); } @TestMetadata("simpleInheritance.java") public void testSimpleInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/simpleInheritance.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/simpleInheritance.java"); doTest(fileName); } @TestMetadata("twoStaticMethod.java") public void testTwoStaticMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/twoStaticMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/twoStaticMethod.java"); doTest(fileName); } @TestMetadata("utilityClass1.java") public void testUtilityClass1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass1.java"); doTest(fileName); } @TestMetadata("utilityClass2.java") public void testUtilityClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass2.java"); doTest(fileName); } @TestMetadata("utilityClass3.java") public void testUtilityClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/class/utilityClass3.java"); doTest(fileName); } } @@ -919,30 +919,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ClassExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/classExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complexExample.java") public void testComplexExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/complexExample.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/complexExample.java"); doTest(fileName); } @TestMetadata("objectClass.java") public void testObjectClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/objectClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/objectClass.java"); doTest(fileName); } @TestMetadata("primitivesAndArrays.java") public void testPrimitivesAndArrays() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/primitivesAndArrays.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/primitivesAndArrays.java"); doTest(fileName); } @TestMetadata("stringClass.java") public void testStringClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/stringClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/classExpression/stringClass.java"); doTest(fileName); } } @@ -952,36 +952,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Comments extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/comments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments.java"); doTest(fileName); } @TestMetadata("comments2.java") public void testComments2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/comments2.java"); doTest(fileName); } @TestMetadata("commentsForConstructors.java") public void testCommentsForConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/commentsForConstructors.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/commentsForConstructors.java"); doTest(fileName); } @TestMetadata("fieldWithEndOfLineComment.java") public void testFieldWithEndOfLineComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldWithEndOfLineComment.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams.java") public void testFieldsInitializedFromParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/comments/fieldsInitializedFromParams.java"); doTest(fileName); } } @@ -991,18 +991,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ConditionalExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInConditionalExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/multiline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/multiline.java"); doTest(fileName); } @TestMetadata("simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/conditionalExpression/simple.java"); doTest(fileName); } } @@ -1013,251 +1013,251 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class Constructors extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("allCallsPrimary.java") public void testAllCallsPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary.java"); doTest(fileName); } @TestMetadata("allCallsPrimary2.java") public void testAllCallsPrimary2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/allCallsPrimary2.java"); doTest(fileName); } public void testAllFilesPresentInConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/constructors"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("artificialPrimary.java") public void testArtificialPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/artificialPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/artificialPrimary.java"); doTest(fileName); } @TestMetadata("chain.java") public void testChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/chain.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/chain.java"); doTest(fileName); } @TestMetadata("constructorAnnotations.java") public void testConstructorAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/constructorAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/constructorAnnotations.java"); doTest(fileName); } @TestMetadata("customerBuilder.java") public void testCustomerBuilder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/customerBuilder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/customerBuilder.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams1.java") public void testFieldsInitializedFromParams1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams1.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams2.java") public void testFieldsInitializedFromParams2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams2.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams3.java") public void testFieldsInitializedFromParams3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams3.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams4.java") public void testFieldsInitializedFromParams4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams4.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams5.java") public void testFieldsInitializedFromParams5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams5.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams6.java") public void testFieldsInitializedFromParams6() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams7.java") public void testFieldsInitializedFromParams7() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams7.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams8.java") public void testFieldsInitializedFromParams8() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParams9.java") public void testFieldsInitializedFromParams9() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.java"); doTest(fileName); } @TestMetadata("fieldsInitializedFromParamsAnnotations.java") public void testFieldsInitializedFromParamsAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/fieldsInitializedFromParamsAnnotations.java"); doTest(fileName); } @TestMetadata("genericIdentifier.java") public void testGenericIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/genericIdentifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/genericIdentifier.java"); doTest(fileName); } @TestMetadata("identifier.java") public void testIdentifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/identifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/identifier.java"); doTest(fileName); } @TestMetadata("lineBreaksBetweenParameters.java") public void testLineBreaksBetweenParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.java"); doTest(fileName); } @TestMetadata("methodCallInFactoryFun.java") public void testMethodCallInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults.java") public void testNestedClassNameInParameterDefaults() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults2.java") public void testNestedClassNameInParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults3.java") public void testNestedClassNameInParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.java"); doTest(fileName); } @TestMetadata("nestedClassNameInParameterDefaults4.java") public void testNestedClassNameInParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.java"); doTest(fileName); } @TestMetadata("nestedClassNameInSuperParameters.java") public void testNestedClassNameInSuperParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.java"); doTest(fileName); } @TestMetadata("noPrimary.java") public void testNoPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/noPrimary.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/noPrimary.java"); doTest(fileName); } @TestMetadata("parameterDefaults1.java") public void testParameterDefaults1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults1.java"); doTest(fileName); } @TestMetadata("parameterDefaults2.java") public void testParameterDefaults2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults2.java"); doTest(fileName); } @TestMetadata("parameterDefaults3.java") public void testParameterDefaults3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults3.java"); doTest(fileName); } @TestMetadata("parameterDefaults4.java") public void testParameterDefaults4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults4.java"); doTest(fileName); } @TestMetadata("parameterDefaults5.java") public void testParameterDefaults5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterDefaults5.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterModification.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/parameterModification.java"); doTest(fileName); } @TestMetadata("privateConstructors.java") public void testPrivateConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/privateConstructors.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/privateConstructors.java"); doTest(fileName); } @TestMetadata("qualifiedRefInFactoryFun.java") public void testQualifiedRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("secondaryConstructorWithDefaultValues.java") public void testSecondaryConstructorWithDefaultValues() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.java"); doTest(fileName); } @TestMetadata("secondaryConstructorWithDefaultValues2.java") public void testSecondaryConstructorWithDefaultValues2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInInnerClass.java") public void testSecondaryConstructorsInInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsInNestedClass.java") public void testSecondaryConstructorsInNestedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.java"); doTest(fileName); } @TestMetadata("secondaryConstructorsVisibility.java") public void testSecondaryConstructorsVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.java"); doTest(fileName); } @TestMetadata("staticFieldRefInFactoryFun.java") public void testStaticFieldRefInFactoryFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.java"); doTest(fileName); } @TestMetadata("withManyDefaultParams.java") public void testWithManyDefaultParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/withManyDefaultParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/constructors/withManyDefaultParams.java"); doTest(fileName); } } @@ -1267,18 +1267,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ContinueStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInContinueStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("continueWithLabel.java") public void testContinueWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithLabel.java"); doTest(fileName); } @TestMetadata("continueWithoutLabel.java") public void testContinueWithoutLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/continueStatement/continueWithoutLabel.java"); doTest(fileName); } } @@ -1288,42 +1288,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInDeclarationStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("multiplyFinalIntDeclaration.java") public void testMultiplyFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("multiplyIntDeclaration.java") public void testMultiplyIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/multiplyIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalIntDeclaration.java") public void testSingleFinalIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleFinalStringDeclaration.java") public void testSingleFinalStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleFinalStringDeclaration.java"); doTest(fileName); } @TestMetadata("singleIntDeclaration.java") public void testSingleIntDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleIntDeclaration.java"); doTest(fileName); } @TestMetadata("singleStringDeclaration.java") public void testSingleStringDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/declarationStatement/singleStringDeclaration.java"); doTest(fileName); } } @@ -1334,185 +1334,185 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class DetectProperties extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("AccessInGetterWithThis.java") public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); doTest(fileName); } @TestMetadata("AccessorsImplementInterface.java") public void testAccessorsImplementInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); doTest(fileName); } public void testAllFilesPresentInDetectProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnonymousClass.java") public void testAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); doTest(fileName); } @TestMetadata("CannotDropOnlySetter.java") public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); doTest(fileName); } @TestMetadata("Comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Comments.java"); doTest(fileName); } @TestMetadata("DataClass.java") public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); doTest(fileName); } @TestMetadata("DataClassWithMutableField.java") public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); doTest(fileName); } @TestMetadata("DifferentFieldName.java") public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); doTest(fileName); } @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); doTest(fileName); } @TestMetadata("DifferentFieldNameAndSuperClass.java") public void testDifferentFieldNameAndSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); doTest(fileName); } @TestMetadata("DifferentProtectedFieldName.java") public void testDifferentProtectedFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); doTest(fileName); } @TestMetadata("DropGetter.java") public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); doTest(fileName); } @TestMetadata("DropGetterAndSetter.java") public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); doTest(fileName); } @TestMetadata("DropGetterForMutable.java") public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); doTest(fileName); } @TestMetadata("FalseGetter.java") public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); doTest(fileName); } @TestMetadata("FalseSetter.java") public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); doTest(fileName); } @TestMetadata("FieldUsagesInFactoryMethods.java") public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); doTest(fileName); } @TestMetadata("GetterAndSetterNamesDifferent.java") public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); doTest(fileName); } @TestMetadata("GetterSetterUsages.java") public void testGetterSetterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); doTest(fileName); } @TestMetadata("GetterTypeNotMatch.java") public void testGetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); doTest(fileName); } @TestMetadata("InCompanionObject.java") public void testInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); doTest(fileName); } @TestMetadata("InInterface.java") public void testInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); doTest(fileName); } @TestMetadata("InObject.java") public void testInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); doTest(fileName); } @TestMetadata("IsPrefix.java") public void testIsPrefix() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/IsPrefix.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/IsPrefix.java"); doTest(fileName); } @TestMetadata("JavaKeywordPropertyName.java") public void testJavaKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); doTest(fileName); } @TestMetadata("KeywordPropertyName.java") public void testKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); doTest(fileName); } @TestMetadata("OverridesOfExternalCode.java") public void testOverridesOfExternalCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); doTest(fileName); } @TestMetadata("PropertyType.java") public void testPropertyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/PropertyType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/PropertyType.java"); doTest(fileName); } @TestMetadata("SetterTypeNotMatch.java") public void testSetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); doTest(fileName); } } @@ -1522,30 +1522,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DoWhileStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInDoWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/doWhileStatement/whileWithReturn.java"); doTest(fileName); } } @@ -1555,54 +1555,54 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class DocComments extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInDocComments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/docComments"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("deprecatedDocTag.java") public void testDeprecatedDocTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/deprecatedDocTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/deprecatedDocTag.java"); doTest(fileName); } @TestMetadata("docCommentWithParamTag.java") public void testDocCommentWithParamTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/docCommentWithParamTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/docCommentWithParamTag.java"); doTest(fileName); } @TestMetadata("htmlInDocComment.java") public void testHtmlInDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/htmlInDocComment.java"); doTest(fileName); } @TestMetadata("inlineTagsInDocComment.java") public void testInlineTagsInDocComment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/inlineTagsInDocComment.java"); doTest(fileName); } @TestMetadata("linkTag.java") public void testLinkTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTag.java"); doTest(fileName); } @TestMetadata("linkTagWithLabel.java") public void testLinkTagWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTagWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/linkTagWithLabel.java"); doTest(fileName); } @TestMetadata("onlyDeprecatedDocTag.java") public void testOnlyDeprecatedDocTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/onlyDeprecatedDocTag.java"); doTest(fileName); } @TestMetadata("seeTag.java") public void testSeeTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/seeTag.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/docComments/seeTag.java"); doTest(fileName); } } @@ -1612,114 +1612,114 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/enum"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("colorEnum.java") public void testColorEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/colorEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/colorEnum.java"); doTest(fileName); } @TestMetadata("companionObject.java") public void testCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/companionObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/companionObject.java"); doTest(fileName); } @TestMetadata("constantsWithBody1.java") public void testConstantsWithBody1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody1.java"); doTest(fileName); } @TestMetadata("constantsWithBody2.java") public void testConstantsWithBody2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/constantsWithBody2.java"); doTest(fileName); } @TestMetadata("emptyEnum.java") public void testEmptyEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/emptyEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/emptyEnum.java"); doTest(fileName); } @TestMetadata("enumConstantIsNotNull.java") public void testEnumConstantIsNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumConstantIsNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumConstantIsNotNull.java"); doTest(fileName); } @TestMetadata("enumImplementsOneInterface.java") public void testEnumImplementsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsOneInterface.java"); doTest(fileName); } @TestMetadata("enumImplementsSeveralInterfaces.java") public void testEnumImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("enumWithNameField.java") public void testEnumWithNameField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumWithNameField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/enumWithNameField.java"); doTest(fileName); } @TestMetadata("fieldsWithPrimaryPrivateConstructor.java") public void testFieldsWithPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/fieldsWithPrimaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("internalEnum.java") public void testInternalEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/internalEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/internalEnum.java"); doTest(fileName); } @TestMetadata("overrideToString.java") public void testOverrideToString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/overrideToString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/overrideToString.java"); doTest(fileName); } @TestMetadata("primaryPrivateConstructor.java") public void testPrimaryPrivateConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/primaryPrivateConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/primaryPrivateConstructor.java"); doTest(fileName); } @TestMetadata("privateEnum.java") public void testPrivateEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/privateEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/privateEnum.java"); doTest(fileName); } @TestMetadata("protectedEnum.java") public void testProtectedEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/protectedEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/protectedEnum.java"); doTest(fileName); } @TestMetadata("publicEnum.java") public void testPublicEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/publicEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/publicEnum.java"); doTest(fileName); } @TestMetadata("runnableImplementation.java") public void testRunnableImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/runnableImplementation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/runnableImplementation.java"); doTest(fileName); } @TestMetadata("typeSafeEnum.java") public void testTypeSafeEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/typeSafeEnum.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/enum/typeSafeEnum.java"); doTest(fileName); } } @@ -1729,42 +1729,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Equals extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/equals"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("EqOperator.java") public void testEqOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/EqOperator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/EqOperator.java"); doTest(fileName); } @TestMetadata("Equals1.java") public void testEquals1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals1.java"); doTest(fileName); } @TestMetadata("Equals2.java") public void testEquals2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals2.java"); doTest(fileName); } @TestMetadata("Equals3.java") public void testEquals3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals3.java"); doTest(fileName); } @TestMetadata("Equals4.java") public void testEquals4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/Equals4.java"); doTest(fileName); } @TestMetadata("ObjectsEquals.java") public void testObjectsEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/ObjectsEquals.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/equals/ObjectsEquals.java"); doTest(fileName); } } @@ -1774,78 +1774,78 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Field extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/field"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classChildExtendsBase.java") public void testClassChildExtendsBase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/classChildExtendsBase.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/classChildExtendsBase.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/conversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/conversion.java"); doTest(fileName); } @TestMetadata("internalField.java") public void testInternalField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/internalField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/internalField.java"); doTest(fileName); } @TestMetadata("privateField.java") public void testPrivateField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/privateField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/privateField.java"); doTest(fileName); } @TestMetadata("protectedField.java") public void testProtectedField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/protectedField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/protectedField.java"); doTest(fileName); } @TestMetadata("publicField.java") public void testPublicField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/publicField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/publicField.java"); doTest(fileName); } @TestMetadata("specifyType.java") public void testSpecifyType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/specifyType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/specifyType.java"); doTest(fileName); } @TestMetadata("valOrVar.java") public void testValOrVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valOrVar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valOrVar.java"); doTest(fileName); } @TestMetadata("valWithInit.java") public void testValWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valWithInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/valWithInit.java"); doTest(fileName); } @TestMetadata("varWithInit.java") public void testVarWithInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithInit.java"); doTest(fileName); } @TestMetadata("varWithoutInit.java") public void testVarWithoutInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithoutInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/varWithoutInit.java"); doTest(fileName); } @TestMetadata("volatileTransientAndStrictFp.java") public void testVolatileTransientAndStrictFp() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.java"); doTest(fileName); } } @@ -1855,252 +1855,252 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class For extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/for"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayIndicesReversed.java") public void testArrayIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/arrayIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/arrayIndicesReversed.java"); doTest(fileName); } @TestMetadata("commonCaseForTest.java") public void testCommonCaseForTest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/commonCaseForTest.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/commonCaseForTest.java"); doTest(fileName); } @TestMetadata("downTo1.java") public void testDownTo1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo1.java"); doTest(fileName); } @TestMetadata("downTo2.java") public void testDownTo2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo2.java"); doTest(fileName); } @TestMetadata("downTo3.java") public void testDownTo3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo3.java"); doTest(fileName); } @TestMetadata("downTo4.java") public void testDownTo4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/downTo4.java"); doTest(fileName); } @TestMetadata("falseArrayIndicesReversed.java") public void testFalseArrayIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed.java"); doTest(fileName); } @TestMetadata("falseArrayIndicesReversed2.java") public void testFalseArrayIndicesReversed2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseArrayIndicesReversed2.java"); doTest(fileName); } @TestMetadata("falseForRange.java") public void testFalseForRange() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseForRange.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseForRange.java"); doTest(fileName); } @TestMetadata("falseIndicesReversed.java") public void testFalseIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseIndicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/falseIndicesReversed.java"); doTest(fileName); } @TestMetadata("forRangeWithBlock.java") public void testForRangeWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithBlock.java"); doTest(fileName); } @TestMetadata("forRangeWithLE.java") public void testForRangeWithLE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLE.java"); doTest(fileName); } @TestMetadata("forRangeWithLT.java") public void testForRangeWithLT() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT.java"); doTest(fileName); } @TestMetadata("forRangeWithLT2.java") public void testForRangeWithLT2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithLT2.java"); doTest(fileName); } @TestMetadata("forRangeWithNE.java") public void testForRangeWithNE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithNE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forRangeWithNE.java"); doTest(fileName); } @TestMetadata("forThroughArrayIndices.java") public void testForThroughArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughArrayIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughCollectionIndices.java") public void testForThroughCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughCollectionIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughCollectionIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndices.java") public void testForThroughListIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndices.java"); doTest(fileName); } @TestMetadata("forThroughListIndicesNE.java") public void testForThroughListIndicesNE() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndicesNE.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughListIndicesNE.java"); doTest(fileName); } @TestMetadata("forThroughNonArrayIndices.java") public void testForThroughNonArrayIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonArrayIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonArrayIndices.java"); doTest(fileName); } @TestMetadata("forThroughNonCollectionIndices.java") public void testForThroughNonCollectionIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.java"); doTest(fileName); } @TestMetadata("forWithBlock.java") public void testForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlock.java"); doTest(fileName); } @TestMetadata("forWithBlockAndDoubleUpdate.java") public void testForWithBlockAndDoubleUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithBlockAndDoubleUpdate.java"); doTest(fileName); } @TestMetadata("forWithEmptyBlock.java") public void testForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("forWithExpression.java") public void testForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithExpression.java"); doTest(fileName); } @TestMetadata("forWithNullCondition.java") public void testForWithNullCondition() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullCondition.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullCondition.java"); doTest(fileName); } @TestMetadata("forWithNullInit.java") public void testForWithNullInit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullInit.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullInit.java"); doTest(fileName); } @TestMetadata("forWithNullUpdate.java") public void testForWithNullUpdate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullUpdate.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithNullUpdate.java"); doTest(fileName); } @TestMetadata("forWithReturn.java") public void testForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/forWithReturn.java"); doTest(fileName); } @TestMetadata("indicesReversed.java") public void testIndicesReversed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/indicesReversed.java"); doTest(fileName); } @TestMetadata("infiniteFor.java") public void testInfiniteFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/infiniteFor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/infiniteFor.java"); doTest(fileName); } @TestMetadata("nameConflict1.java") public void testNameConflict1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict1.java"); doTest(fileName); } @TestMetadata("nameConflict2.java") public void testNameConflict2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict2.java"); doTest(fileName); } @TestMetadata("nameConflict3.java") public void testNameConflict3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict3.java"); doTest(fileName); } @TestMetadata("nameConflict4.java") public void testNameConflict4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict4.java"); doTest(fileName); } @TestMetadata("nameConflict5.java") public void testNameConflict5() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict5.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/nameConflict5.java"); doTest(fileName); } @TestMetadata("notInBlock.java") public void testNotInBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/notInBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/notInBlock.java"); doTest(fileName); } @TestMetadata("withContinue1.java") public void testWithContinue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue1.java"); doTest(fileName); } @TestMetadata("withContinue2.java") public void testWithContinue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue2.java"); doTest(fileName); } @TestMetadata("withContinue3.java") public void testWithContinue3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinue3.java"); doTest(fileName); } @TestMetadata("withContinueAndLabels.java") public void testWithContinueAndLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinueAndLabels.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/for/withContinueAndLabels.java"); doTest(fileName); } } @@ -2110,36 +2110,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ForeachStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInForeachStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("enhancedForWithBlock.java") public void testEnhancedForWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithEmptyBlock.java") public void testEnhancedForWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("enhancedForWithExpression.java") public void testEnhancedForWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithExpression.java"); doTest(fileName); } @TestMetadata("enhancedForWithReturn.java") public void testEnhancedForWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/enhancedForWithReturn.java"); doTest(fileName); } @TestMetadata("nullableIterable.java") public void testNullableIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/foreachStatement/nullableIterable.java"); doTest(fileName); } } @@ -2149,36 +2149,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Formatting extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFormatting() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/formatting"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("lineBreaksBetweenArguments.java") public void testLineBreaksBetweenArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.java"); doTest(fileName); } @TestMetadata("nonStaticMembers.java") public void testNonStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembers.java"); doTest(fileName); } @TestMetadata("nonStaticMembersWithComments.java") public void testNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticAndNonStaticMembersWithComments.java") public void testStaticAndNonStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.java"); doTest(fileName); } @TestMetadata("staticMembersWithComments.java") public void testStaticMembersWithComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticMembersWithComments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/formatting/staticMembersWithComments.java"); doTest(fileName); } } @@ -2189,209 +2189,209 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class Function extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstractMethod.java") public void testAbstractMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/abstractMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/abstractMethod.java"); doTest(fileName); } public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/function"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classGenericParam.java") public void testClassGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/classGenericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/classGenericParam.java"); doTest(fileName); } @TestMetadata("emptyVoidMethod.java") public void testEmptyVoidMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/emptyVoidMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/emptyVoidMethod.java"); doTest(fileName); } @TestMetadata("extendsBaseWhichExtendsObject.java") public void testExtendsBaseWhichExtendsObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/extendsBaseWhichExtendsObject.java"); doTest(fileName); } @TestMetadata("final.java") public void testFinal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/final.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/final.java"); doTest(fileName); } @TestMetadata("functionInFinalClass.java") public void testFunctionInFinalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/functionInFinalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/functionInFinalClass.java"); doTest(fileName); } @TestMetadata("internal.java") public void testInternal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/internal.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/internal.java"); doTest(fileName); } @TestMetadata("java8Lambdas.java") public void testJava8Lambdas() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8Lambdas.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8Lambdas.java"); doTest(fileName); } @TestMetadata("java8MRKFunctionExpectedType.java") public void testJava8MRKFunctionExpectedType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.java"); doTest(fileName); } @TestMetadata("java8MRSamConstructor.java") public void testJava8MRSamConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRSamConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/java8MRSamConstructor.java"); doTest(fileName); } @TestMetadata("lineBreaksBetweenParameters.java") public void testLineBreaksBetweenParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.java"); doTest(fileName); } @TestMetadata("main.java") public void testMain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main.java"); doTest(fileName); } @TestMetadata("main2.java") public void testMain2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/main2.java"); doTest(fileName); } @TestMetadata("mainAndNullabilitySetting.java") public void testMainAndNullabilitySetting() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java"); doTest(fileName); } @TestMetadata("methodClassType.java") public void testMethodClassType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodClassType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodClassType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType.java") public void testMethodPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType.java"); doTest(fileName); } @TestMetadata("methodPrimitiveType2.java") public void testMethodPrimitiveType2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodPrimitiveType2.java"); doTest(fileName); } @TestMetadata("methodWithReturnStatement.java") public void testMethodWithReturnStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodWithReturnStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/methodWithReturnStatement.java"); doTest(fileName); } @TestMetadata("open.java") public void testOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/open.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/open.java"); doTest(fileName); } @TestMetadata("override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/override.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/override.java"); doTest(fileName); } @TestMetadata("overrideAndOpen.java") public void testOverrideAndOpen() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideAndOpen.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideAndOpen.java"); doTest(fileName); } @TestMetadata("overrideObject.java") public void testOverrideObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject.java"); doTest(fileName); } @TestMetadata("overrideObject2.java") public void testOverrideObject2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject2.java"); doTest(fileName); } @TestMetadata("overrideObject3.java") public void testOverrideObject3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideObject3.java"); doTest(fileName); } @TestMetadata("overrideWithHigherVisibility.java") public void testOverrideWithHigherVisibility() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideWithHigherVisibility.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/overrideWithHigherVisibility.java"); doTest(fileName); } @TestMetadata("ownGenericParam.java") public void testOwnGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownGenericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownGenericParam.java"); doTest(fileName); } @TestMetadata("ownSeveralGenericParams.java") public void testOwnSeveralGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownSeveralGenericParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/ownSeveralGenericParams.java"); doTest(fileName); } @TestMetadata("parameterModification.java") public void testParameterModification() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/parameterModification.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/parameterModification.java"); doTest(fileName); } @TestMetadata("private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/private.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/private.java"); doTest(fileName); } @TestMetadata("protected.java") public void testProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/protected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/protected.java"); doTest(fileName); } @TestMetadata("public.java") public void testPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/public.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/public.java"); doTest(fileName); } @TestMetadata("synchronizedMethod.java") public void testSynchronizedMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/synchronizedMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/synchronizedMethod.java"); doTest(fileName); } @TestMetadata("throws.java") public void testThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/throws.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/throws.java"); doTest(fileName); } @TestMetadata("varVararg.java") public void testVarVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/varVararg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/function/varVararg.java"); doTest(fileName); } } @@ -2401,24 +2401,24 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Identifier extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIdentifier() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/identifier"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("finalFieldReference.java") public void testFinalFieldReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/finalFieldReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/finalFieldReference.java"); doTest(fileName); } @TestMetadata("keywords.java") public void testKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/keywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/keywords.java"); doTest(fileName); } @TestMetadata("withDollar.java") public void testWithDollar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/withDollar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/identifier/withDollar.java"); doTest(fileName); } } @@ -2428,42 +2428,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class IfStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIfStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("elseIf.java") public void testElseIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/elseIf.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/elseIf.java"); doTest(fileName); } @TestMetadata("multiLine.java") public void testMultiLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/multiLine.java"); doTest(fileName); } @TestMetadata("singleLine.java") public void testSingleLine() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/singleLine.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/singleLine.java"); doTest(fileName); } @TestMetadata("withBlocks.java") public void testWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withBlocks.java"); doTest(fileName); } @TestMetadata("withEmptyBlocks.java") public void testWithEmptyBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withEmptyBlocks.java"); doTest(fileName); } @TestMetadata("withoutElse.java") public void testWithoutElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withoutElse.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/ifStatement/withoutElse.java"); doTest(fileName); } } @@ -2473,36 +2473,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ImportStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInImportStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/importStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("importWithKeywords.java") public void testImportWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithKeywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithKeywords.java"); doTest(fileName); } @TestMetadata("importWithStar.java") public void testImportWithStar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithStar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/importWithStar.java"); doTest(fileName); } @TestMetadata("oneImport.java") public void testOneImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/oneImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/oneImport.java"); doTest(fileName); } @TestMetadata("onlyImports.java") public void testOnlyImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/onlyImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/onlyImports.java"); doTest(fileName); } @TestMetadata("simpleImport.java") public void testSimpleImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/simpleImport.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/importStatement/simpleImport.java"); doTest(fileName); } } @@ -2512,36 +2512,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Inheritance extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInInheritance() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/inheritance"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classOneExtendsBaseGeneric.java") public void testClassOneExtendsBaseGeneric() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithOneParam.java") public void testClassOneExtendsBaseWithOneParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParams.java") public void testClassOneExtendsBaseWithZeroParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParams.java"); doTest(fileName); } @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java") public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java"); doTest(fileName); } @TestMetadata("openModifier.java") public void testOpenModifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/openModifier.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/inheritance/openModifier.java"); doTest(fileName); } } @@ -2551,18 +2551,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class IsOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIsOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/isOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExpression.java") public void testComplicatedExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/complicatedExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/complicatedExpression.java"); doTest(fileName); } @TestMetadata("simpleReference.java") public void testSimpleReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/simpleReference.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/isOperator/simpleReference.java"); doTest(fileName); } } @@ -2572,228 +2572,228 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Issues extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInIssues() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/issues"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("arrayLength.java") public void testArrayLength() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/arrayLength.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/arrayLength.java"); doTest(fileName); } @TestMetadata("comments.java") public void testComments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/comments.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/comments.java"); doTest(fileName); } @TestMetadata("doNotQualifyStatic.java") public void testDoNotQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/doNotQualifyStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/doNotQualifyStatic.java"); doTest(fileName); } @TestMetadata("kt-1016.java") public void testKt_1016() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1016.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1016.java"); doTest(fileName); } @TestMetadata("kt-1048.java") public void testKt_1048() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1048.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1048.java"); doTest(fileName); } @TestMetadata("kt-1074.java") public void testKt_1074() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1074.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-1074.java"); doTest(fileName); } @TestMetadata("kt-5294.java") public void testKt_5294() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5294.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5294.java"); doTest(fileName); } @TestMetadata("kt-5400.java") public void testKt_5400() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5400.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-5400.java"); doTest(fileName); } @TestMetadata("kt-543.java") public void testKt_543() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543.java"); doTest(fileName); } @TestMetadata("kt-543-boxed.java") public void testKt_543_boxed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-boxed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-boxed.java"); doTest(fileName); } @TestMetadata("kt-543-mixed.java") public void testKt_543_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-543-mixed.java"); doTest(fileName); } @TestMetadata("kt-638.java") public void testKt_638() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-638.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-638.java"); doTest(fileName); } @TestMetadata("kt-696.java") public void testKt_696() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-696.java"); doTest(fileName); } @TestMetadata("kt-792.java") public void testKt_792() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792.java"); doTest(fileName); } @TestMetadata("kt-792-mixed.java") public void testKt_792_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-792-mixed.java"); doTest(fileName); } @TestMetadata("kt-794.java") public void testKt_794() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794.java"); doTest(fileName); } @TestMetadata("kt-794-mixed.java") public void testKt_794_mixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794-mixed.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-794-mixed.java"); doTest(fileName); } @TestMetadata("kt-807.java") public void testKt_807() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-807.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-807.java"); doTest(fileName); } @TestMetadata("kt-809.java") public void testKt_809() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809.java"); doTest(fileName); } @TestMetadata("kt-809-string.java") public void testKt_809_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809-string.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-809-string.java"); doTest(fileName); } @TestMetadata("kt-820.java") public void testKt_820() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820.java"); doTest(fileName); } @TestMetadata("kt-820-field.java") public void testKt_820_field() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-field.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-field.java"); doTest(fileName); } @TestMetadata("kt-820-string.java") public void testKt_820_string() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-string.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-820-string.java"); doTest(fileName); } @TestMetadata("kt-824.java") public void testKt_824() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824.java"); doTest(fileName); } @TestMetadata("kt-824-isDir.java") public void testKt_824_isDir() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824-isDir.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-824-isDir.java"); doTest(fileName); } @TestMetadata("kt-828.java") public void testKt_828() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-828.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-828.java"); doTest(fileName); } @TestMetadata("kt-836.java") public void testKt_836() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-836.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-836.java"); doTest(fileName); } @TestMetadata("kt-837.java") public void testKt_837() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-837.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-837.java"); doTest(fileName); } @TestMetadata("kt-851.java") public void testKt_851() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-851.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-851.java"); doTest(fileName); } @TestMetadata("kt-852.java") public void testKt_852() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-852.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-852.java"); doTest(fileName); } @TestMetadata("kt-871.java") public void testKt_871() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-871.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-871.java"); doTest(fileName); } @TestMetadata("kt-879.java") public void testKt_879() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-879.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-879.java"); doTest(fileName); } @TestMetadata("kt-893.java") public void testKt_893() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-893.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-893.java"); doTest(fileName); } @TestMetadata("kt-899.java") public void testKt_899() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-899.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-899.java"); doTest(fileName); } @TestMetadata("kt-963.java") public void testKt_963() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-963.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/kt-963.java"); doTest(fileName); } @TestMetadata("qualifyStatic.java") public void testQualifyStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/qualifyStatic.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/qualifyStatic.java"); doTest(fileName); } @TestMetadata("spaceBeforeAssignment.java") public void testSpaceBeforeAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/spaceBeforeAssignment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/issues/spaceBeforeAssignment.java"); doTest(fileName); } } @@ -2803,84 +2803,84 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class KotlinApiAccess extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInKotlinApiAccess() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ClassObjectMembers.java") public void testClassObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.java"); doTest(fileName); } @TestMetadata("CorrectFunNullabilityDetected.java") public void testCorrectFunNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.java"); doTest(fileName); } @TestMetadata("CorrectNullabilityDetected.java") public void testCorrectNullabilityDetected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.java"); doTest(fileName); } @TestMetadata("ExtensionFunction.java") public void testExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.java"); doTest(fileName); } @TestMetadata("ExtensionProperty.java") public void testExtensionProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.java"); doTest(fileName); } @TestMetadata("GlobalFunction.java") public void testGlobalFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.java"); doTest(fileName); } @TestMetadata("GlobalGenericFunction.java") public void testGlobalGenericFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.java"); doTest(fileName); } @TestMetadata("GlobalValue1.java") public void testGlobalValue1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.java"); doTest(fileName); } @TestMetadata("GlobalValue2.java") public void testGlobalValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.java"); doTest(fileName); } @TestMetadata("InheritedProperty.java") public void testInheritedProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.java"); doTest(fileName); } @TestMetadata("ObjectMembers.java") public void testObjectMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.java"); doTest(fileName); } @TestMetadata("Property.java") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property.java"); doTest(fileName); } @TestMetadata("Property2.java") public void testProperty2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/kotlinApiAccess/Property2.java"); doTest(fileName); } } @@ -2890,12 +2890,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LabelStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLabelStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("complicatedExampleFromJavaTutorial.java") public void testComplicatedExampleFromJavaTutorial() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/labelStatement/complicatedExampleFromJavaTutorial.java"); doTest(fileName); } } @@ -2905,18 +2905,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class List extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInList() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/list"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ForEach.java") public void testForEach() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/ForEach.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/ForEach.java"); doTest(fileName); } @TestMetadata("Lists.java") public void testLists() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/Lists.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/list/Lists.java"); doTest(fileName); } } @@ -2926,60 +2926,60 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LiteralExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLiteralExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("char.java") public void testChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/char.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/char.java"); doTest(fileName); } @TestMetadata("dollarInsideString.java") public void testDollarInsideString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/dollarInsideString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/dollarInsideString.java"); doTest(fileName); } @TestMetadata("double.java") public void testDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/double.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/double.java"); doTest(fileName); } @TestMetadata("endsWithDFL.java") public void testEndsWithDFL() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/endsWithDFL.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/endsWithDFL.java"); doTest(fileName); } @TestMetadata("float.java") public void testFloat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/float.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/float.java"); doTest(fileName); } @TestMetadata("hex.java") public void testHex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/hex.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/hex.java"); doTest(fileName); } @TestMetadata("long.java") public void testLong() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/long.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/long.java"); doTest(fileName); } @TestMetadata("octal.java") public void testOctal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/octal.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/octal.java"); doTest(fileName); } @TestMetadata("trueOrFalse.java") public void testTrueOrFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/trueOrFalse.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/literalExpression/trueOrFalse.java"); doTest(fileName); } } @@ -2989,60 +2989,60 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class LocalVariable extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInLocalVariable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/localVariable"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoBangBang.java") public void testAutoBangBang() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/autoBangBang.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/autoBangBang.java"); doTest(fileName); } @TestMetadata("conversion.java") public void testConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/conversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/conversion.java"); doTest(fileName); } @TestMetadata("literalConversion.java") public void testLiteralConversion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/literalConversion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/literalConversion.java"); doTest(fileName); } @TestMetadata("nullIInitializer.java") public void testNullIInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/nullIInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/nullIInitializer.java"); doTest(fileName); } @TestMetadata("object.java") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/object.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/object.java"); doTest(fileName); } @TestMetadata("unboxing.java") public void testUnboxing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/unboxing.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/unboxing.java"); doTest(fileName); } @TestMetadata("valTypeDoNotMatch.java") public void testValTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varTypeDoNotMatch.java") public void testVarTypeDoNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.java"); doTest(fileName); } @TestMetadata("varWithNoInitializer.java") public void testVarWithNoInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varWithNoInitializer.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/localVariable/varWithNoInitializer.java"); doTest(fileName); } } @@ -3052,78 +3052,78 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class MethodCallExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInMethodCallExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("callWithKeywords.java") public void testCallWithKeywords() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/callWithKeywords.java"); doTest(fileName); } @TestMetadata("collectionsMethods.java") public void testCollectionsMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.java"); doTest(fileName); } @TestMetadata("collectionsMethods2.java") public void testCollectionsMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.java"); doTest(fileName); } @TestMetadata("emptyCall.java") public void testEmptyCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/emptyCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/emptyCall.java"); doTest(fileName); } @TestMetadata("genericMethod.java") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/genericMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/genericMethod.java"); doTest(fileName); } @TestMetadata("getClass.java") public void testGetClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/getClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/getClass.java"); doTest(fileName); } @TestMetadata("simpleCall.java") public void testSimpleCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/simpleCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/simpleCall.java"); doTest(fileName); } @TestMetadata("specialBuiltinMembers.java") public void testSpecialBuiltinMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/specialBuiltinMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/specialBuiltinMembers.java"); doTest(fileName); } @TestMetadata("stringMethods.java") public void testStringMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/stringMethods.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/stringMethods.java"); doTest(fileName); } @TestMetadata("systemOut.java") public void testSystemOut() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/systemOut.java"); doTest(fileName); } @TestMetadata("vararg1.java") public void testVararg1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg1.java"); doTest(fileName); } @TestMetadata("vararg2.java") public void testVararg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/methodCallExpression/vararg2.java"); doTest(fileName); } } @@ -3133,42 +3133,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Misc extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInMisc() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/misc"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("packageWithClass.java") public void testPackageWithClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClass.java"); doTest(fileName); } @TestMetadata("packageWithClasses.java") public void testPackageWithClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClasses.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithClasses.java"); doTest(fileName); } @TestMetadata("packageWithImports.java") public void testPackageWithImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithImports.java"); doTest(fileName); } @TestMetadata("packageWithMixedImports.java") public void testPackageWithMixedImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithMixedImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithMixedImports.java"); doTest(fileName); } @TestMetadata("packageWithOpenClass.java") public void testPackageWithOpenClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithOpenClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithOpenClass.java"); doTest(fileName); } @TestMetadata("packageWithStaticImports.java") public void testPackageWithStaticImports() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithStaticImports.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/misc/packageWithStaticImports.java"); doTest(fileName); } } @@ -3178,42 +3178,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class MutableCollections extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInMutableCollections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/mutableCollections"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/mutableCollections"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("FunctionParameters.java") public void testFunctionParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters.java"); doTest(fileName); } @TestMetadata("FunctionParameters2.java") public void testFunctionParameters2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.java"); doTest(fileName); } @TestMetadata("FunctionReturnValue.java") public void testFunctionReturnValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.java"); doTest(fileName); } @TestMetadata("FunctionReturnValue2.java") public void testFunctionReturnValue2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Overrides.java"); doTest(fileName); } @TestMetadata("Recursion.java") public void testRecursion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Recursion.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/mutableCollections/Recursion.java"); doTest(fileName); } } @@ -3223,90 +3223,90 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class NewClassExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInNewClassExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classWithParam.java") public void testClassWithParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParam.java"); doTest(fileName); } @TestMetadata("classWithParams.java") public void testClassWithParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithParams.java"); doTest(fileName); } @TestMetadata("classWithoutBody.java") public void testClassWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithoutBody.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/classWithoutBody.java"); doTest(fileName); } @TestMetadata("fullQualifiedName.java") public void testFullQualifiedName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.java"); doTest(fileName); } @TestMetadata("fullQualifiedName2.java") public void testFullQualifiedName2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.java"); doTest(fileName); } @TestMetadata("genericClassInvocation.java") public void testGenericClassInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.java"); doTest(fileName); } @TestMetadata("lineBreaks.java") public void testLineBreaks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/lineBreaks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/lineBreaks.java"); doTest(fileName); } @TestMetadata("newAnonymousClass.java") public void testNewAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass.java"); doTest(fileName); } @TestMetadata("newAnonymousClass2.java") public void testNewAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.java"); doTest(fileName); } @TestMetadata("newAnonymousClass3.java") public void testNewAnonymousClass3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.java"); doTest(fileName); } @TestMetadata("newClassByFullName.java") public void testNewClassByFullName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newClassByFullName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newClassByFullName.java"); doTest(fileName); } @TestMetadata("newInnerClass.java") public void testNewInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newInnerClass.java"); doTest(fileName); } @TestMetadata("newListAndNewMember.java") public void testNewListAndNewMember() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.java"); doTest(fileName); } @TestMetadata("newStaticInnerClass.java") public void testNewStaticInnerClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.java"); doTest(fileName); } } @@ -3316,186 +3316,186 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Nullability extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInNullability() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/nullability"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("autoNotNull.java") public void testAutoNotNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/autoNotNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/autoNotNull.java"); doTest(fileName); } @TestMetadata("FieldAssignedWithNull.java") public void testFieldAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull.java") public void testFieldComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull2.java") public void testFieldComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull3.java") public void testFieldComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.java"); doTest(fileName); } @TestMetadata("FieldComparedWithNull4.java") public void testFieldComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldComparedWithNull4.java"); doTest(fileName); } @TestMetadata("FieldInitializedWithNull.java") public void testFieldInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.java"); doTest(fileName); } @TestMetadata("IndirectOverride.java") public void testIndirectOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/IndirectOverride.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/IndirectOverride.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg.java") public void testMethodInvokedWithNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithNullArg2.java") public void testMethodInvokedWithNullArg2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.java"); doTest(fileName); } @TestMetadata("MethodInvokedWithTernaryNullArg.java") public void testMethodInvokedWithTernaryNullArg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull.java") public void testMethodResultComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull2.java") public void testMethodResultComparedWithNull2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull3.java") public void testMethodResultComparedWithNull3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.java"); doTest(fileName); } @TestMetadata("MethodResultComparedWithNull4.java") public void testMethodResultComparedWithNull4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.java"); doTest(fileName); } @TestMetadata("MethodResultInitializesNullableField.java") public void testMethodResultInitializesNullableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.java"); doTest(fileName); } @TestMetadata("MethodReturnsNull.java") public void testMethodReturnsNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNull.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInAnonymousClass.java") public void testMethodReturnsNullInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsNullInLocalClass.java") public void testMethodReturnsNullInLocalClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.java"); doTest(fileName); } @TestMetadata("MethodReturnsTernaryNull.java") public void testMethodReturnsTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.java"); doTest(fileName); } @TestMetadata("NullableIntNoCrash.java") public void testNullableIntNoCrash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableIntNoCrash.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableIntNoCrash.java"); doTest(fileName); } @TestMetadata("NullableMethodDotAccess.java") public void testNullableMethodDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.java"); doTest(fileName); } @TestMetadata("NullableVariableDotAccess.java") public void testNullableVariableDotAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.java"); doTest(fileName); } @TestMetadata("OverrideWithInheritanceLoop.java") public void testOverrideWithInheritanceLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.java"); doTest(fileName); } @TestMetadata("Overrides.java") public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/Overrides.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/Overrides.java"); doTest(fileName); } @TestMetadata("ParameterComparedWithNull.java") public void testParameterComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableAssignedWithNull.java") public void testVariableAssignedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java"); doTest(fileName); } @TestMetadata("VariableComparedWithNull.java") public void testVariableComparedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithNull.java") public void testVariableInitializedWithNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java"); doTest(fileName); } @TestMetadata("VariableInitializedWithTernaryNull.java") public void testVariableInitializedWithTernaryNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java"); doTest(fileName); } } @@ -3505,12 +3505,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ObjectLiteral extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInObjectLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("MyFrame.java") public void testMyFrame() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/objectLiteral/MyFrame.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/objectLiteral/MyFrame.java"); doTest(fileName); } } @@ -3521,47 +3521,47 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class Overloads extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("Abstract.java") public void testAbstract() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Abstract.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Abstract.java"); doTest(fileName); } @TestMetadata("AccessorToDrop.java") public void testAccessorToDrop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/AccessorToDrop.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/AccessorToDrop.java"); doTest(fileName); } public void testAllFilesPresentInOverloads() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/overloads"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/overloads"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Annotations.java") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Annotations.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Annotations.java"); doTest(fileName); } @TestMetadata("Override.java") public void testOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Override.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Override.java"); doTest(fileName); } @TestMetadata("Private.java") public void testPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Private.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Private.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Simple.java"); doTest(fileName); } @TestMetadata("Synchronized.java") public void testSynchronized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Synchronized.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/overloads/Synchronized.java"); doTest(fileName); } } @@ -3571,12 +3571,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PackageStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPackageStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("keywordInPackageName.java") public void testKeywordInPackageName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); doTest(fileName); } } @@ -3586,18 +3586,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInParenthesizedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("parenthesized.java") public void testParenthesized() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized.java"); doTest(fileName); } @TestMetadata("parenthesized2.java") public void testParenthesized2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/parenthesizedExpression/parenthesized2.java"); doTest(fileName); } } @@ -3607,42 +3607,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PolyadicExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPolyadicExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("divide.java") public void testDivide() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/divide.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/divide.java"); doTest(fileName); } @TestMetadata("minus.java") public void testMinus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/minus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/minus.java"); doTest(fileName); } @TestMetadata("multiply.java") public void testMultiply() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/multiply.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/multiply.java"); doTest(fileName); } @TestMetadata("plus.java") public void testPlus() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/plus.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/plus.java"); doTest(fileName); } @TestMetadata("remainder.java") public void testRemainder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/remainder.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/remainder.java"); doTest(fileName); } @TestMetadata("unassignedShiftRight.java") public void testUnassignedShiftRight() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/polyadicExpression/unassignedShiftRight.java"); doTest(fileName); } } @@ -3652,60 +3652,60 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PostProcessing extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPostProcessing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnonymousObject.java") public void testAnonymousObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/AnonymousObject.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/AnonymousObject.java"); doTest(fileName); } @TestMetadata("GetOperator.java") public void testGetOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); doTest(fileName); } @TestMetadata("IfNullReturnToElvis.java") public void testIfNullReturnToElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); doTest(fileName); } @TestMetadata("IfToElvis.java") public void testIfToElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); doTest(fileName); } @TestMetadata("IfToSafeCall.java") public void testIfToSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); doTest(fileName); } @TestMetadata("NotIs.java") public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); doTest(fileName); } @TestMetadata("RedundantTypeCast.java") public void testRedundantTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); doTest(fileName); } @TestMetadata("RedundantTypeCastAndInline.java") public void testRedundantTypeCastAndInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); doTest(fileName); } @TestMetadata("SyntheticExtensionPropertyAccess.java") public void testSyntheticExtensionPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); doTest(fileName); } } @@ -3715,18 +3715,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PostfixOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPostfixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/decrement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/decrement.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/increment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/postfixOperator/increment.java"); doTest(fileName); } } @@ -3736,42 +3736,42 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class PrefixOperator extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInPrefixOperator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("decrement.java") public void testDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/decrement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/decrement.java"); doTest(fileName); } @TestMetadata("excl.java") public void testExcl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/excl.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/excl.java"); doTest(fileName); } @TestMetadata("increment.java") public void testIncrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/increment.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/increment.java"); doTest(fileName); } @TestMetadata("kt-667.java") public void testKt_667() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/kt-667.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/kt-667.java"); doTest(fileName); } @TestMetadata("nullableIf.java") public void testNullableIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/nullableIf.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/nullableIf.java"); doTest(fileName); } @TestMetadata("tilde.java") public void testTilde() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/tilde.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/prefixOperator/tilde.java"); doTest(fileName); } } @@ -3781,12 +3781,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Projections extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInProjections() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/projections"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("projections.java") public void testProjections() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/projections/projections.java"); doTest(fileName); } } @@ -3796,36 +3796,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class RawGenerics extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInRawGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("cycle.java") public void testCycle() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/cycle.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/cycle.java"); doTest(fileName); } @TestMetadata("kt-540.java") public void testKt_540() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540.java"); doTest(fileName); } @TestMetadata("kt-540-map.java") public void testKt_540_map() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-map.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-map.java"); doTest(fileName); } @TestMetadata("kt-540-rawGenericClass.java") public void testKt_540_rawGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.java"); doTest(fileName); } @TestMetadata("rawGenericMethod.java") public void testRawGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.java"); doTest(fileName); } } @@ -3835,36 +3835,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ReturnStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInReturnStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("currentMethodBug.java") public void testCurrentMethodBug() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/currentMethodBug.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/currentMethodBug.java"); doTest(fileName); } @TestMetadata("returnChar.java") public void testReturnChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnChar.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnChar.java"); doTest(fileName); } @TestMetadata("returnLiteral.java") public void testReturnLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnLiteral.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnLiteral.java"); doTest(fileName); } @TestMetadata("returnNumber.java") public void testReturnNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnNumber.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnNumber.java"); doTest(fileName); } @TestMetadata("returnString.java") public void testReturnString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnString.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/returnStatement/returnString.java"); doTest(fileName); } } @@ -3874,30 +3874,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Settings extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSettings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/settings"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("openByDefault.java") public void testOpenByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/openByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/openByDefault.java"); doTest(fileName); } @TestMetadata("specifyFieldTypeByDefault.java") public void testSpecifyFieldTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefault.java") public void testSpecifyLocalVariableTypeByDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java"); doTest(fileName); } @TestMetadata("specifyLocalVariableTypeByDefaultInFor.java") public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java"); doTest(fileName); } } @@ -3907,36 +3907,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInStaticMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PrivateStaticMembers.java") public void testPrivateStaticMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods1.java") public void testPrivateStaticMethods1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods2.java") public void testPrivateStaticMethods2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods3.java") public void testPrivateStaticMethods3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.java"); doTest(fileName); } @TestMetadata("PrivateStaticMethods4.java") public void testPrivateStaticMethods4() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.java"); doTest(fileName); } } @@ -3946,24 +3946,24 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class SuperExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSuperExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/superExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotSuperFoo.java") public void testClassAdotSuperFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.java"); doTest(fileName); } @TestMetadata("classAextendsB.java") public void testClassAextendsB() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAextendsB.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/classAextendsB.java"); doTest(fileName); } @TestMetadata("superStatement.java") public void testSuperStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/superStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/superExpression/superStatement.java"); doTest(fileName); } } @@ -3973,72 +3973,72 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class Switch extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSwitch() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/switch"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("caseWithBlock.java") public void testCaseWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/caseWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/caseWithBlock.java"); doTest(fileName); } @TestMetadata("comlicatedFallDown.java") public void testComlicatedFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/comlicatedFallDown.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/comlicatedFallDown.java"); doTest(fileName); } @TestMetadata("continueAndBreakWithLabel.java") public void testContinueAndBreakWithLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.java"); doTest(fileName); } @TestMetadata("emptySwitch.java") public void testEmptySwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/emptySwitch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/emptySwitch.java"); doTest(fileName); } @TestMetadata("enumConstants.java") public void testEnumConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/enumConstants.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/enumConstants.java"); doTest(fileName); } @TestMetadata("fallDown.java") public void testFallDown() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDown.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDown.java"); doTest(fileName); } @TestMetadata("fallDownWithBlocks.java") public void testFallDownWithBlocks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDownWithBlocks.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/fallDownWithBlocks.java"); doTest(fileName); } @TestMetadata("invalidSwitch.java") public void testInvalidSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/invalidSwitch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/invalidSwitch.java"); doTest(fileName); } @TestMetadata("kt-539.java") public void testKt_539() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/kt-539.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/kt-539.java"); doTest(fileName); } @TestMetadata("nondefault.java") public void testNondefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/nondefault.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/nondefault.java"); doTest(fileName); } @TestMetadata("returnsAndThrows.java") public void testReturnsAndThrows() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/returnsAndThrows.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/switch/returnsAndThrows.java"); doTest(fileName); } } @@ -4048,12 +4048,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class SynchronizedStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInSynchronizedStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("singleLineExample.java") public void testSingleLineExample() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/synchronizedStatement/singleLineExample.java"); doTest(fileName); } } @@ -4063,18 +4063,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ThisExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInThisExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classAdotThisFoo.java") public void testClassAdotThisFoo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.java"); doTest(fileName); } @TestMetadata("thisStatement.java") public void testThisStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/thisStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/thisExpression/thisStatement.java"); doTest(fileName); } } @@ -4084,12 +4084,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ThrowStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInThrowStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("simpleThrowStatement.java") public void testSimpleThrowStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/throwStatement/simpleThrowStatement.java"); doTest(fileName); } } @@ -4099,30 +4099,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class ToKotlinClasses extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInToKotlinClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("iterableAndIterator.java") public void testIterableAndIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.java"); doTest(fileName); } @TestMetadata("iterableAndIterator2.java") public void testIterableAndIterator2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.java"); doTest(fileName); } @TestMetadata("iterableAndIterator3.java") public void testIterableAndIterator3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.java"); doTest(fileName); } @TestMetadata("TypeParameterBound.java") public void testTypeParameterBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/toKotlinClasses/TypeParameterBound.java"); doTest(fileName); } } @@ -4133,71 +4133,71 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo public static class Trait extends AbstractJavaToKotlinConverterSingleFileTest { @TestMetadata("abstactInterface.java") public void testAbstactInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/abstactInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/abstactInterface.java"); doTest(fileName); } public void testAllFilesPresentInTrait() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/trait"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("emptyInterface.java") public void testEmptyInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/emptyInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/emptyInterface.java"); doTest(fileName); } @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java") public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneClassAndImplementsSeveralInterfaces.java"); doTest(fileName); } @TestMetadata("extendsOneInterface.java") public void testExtendsOneInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/extendsOneInterface.java"); doTest(fileName); } @TestMetadata("interfaceWithFields.java") public void testInterfaceWithFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithFields.java"); doTest(fileName); } @TestMetadata("interfaceWithMethodDeclaration.java") public void testInterfaceWithMethodDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithMethodDeclaration.java"); doTest(fileName); } @TestMetadata("interfaceWithStaticFields.java") public void testInterfaceWithStaticFields() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithStaticFields.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/interfaceWithStaticFields.java"); doTest(fileName); } @TestMetadata("internalInterface.java") public void testInternalInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/internalInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/internalInterface.java"); doTest(fileName); } @TestMetadata("privateInterface.java") public void testPrivateInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/privateInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/privateInterface.java"); doTest(fileName); } @TestMetadata("protectedInterface.java") public void testProtectedInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/protectedInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/protectedInterface.java"); doTest(fileName); } @TestMetadata("publicInterface.java") public void testPublicInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/publicInterface.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/trait/publicInterface.java"); doTest(fileName); } } @@ -4207,36 +4207,36 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TryStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTryStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("commonCaseForTryStatement.java") public void testCommonCaseForTryStatement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/commonCaseForTryStatement.java"); doTest(fileName); } @TestMetadata("disjunctionType.java") public void testDisjunctionType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/disjunctionType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/disjunctionType.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java") public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithFinally.java") public void testEmptyTryWithTwoCatchesWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithFinally.java"); doTest(fileName); } @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java") public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java"); doTest(fileName); } } @@ -4246,66 +4246,66 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TryWithResource extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTryWithResource() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("Multiline.java") public void testMultiline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Multiline.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Multiline.java"); doTest(fileName); } @TestMetadata("MultipleResources.java") public void testMultipleResources() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/MultipleResources.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/MultipleResources.java"); doTest(fileName); } @TestMetadata("Simple.java") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Simple.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/Simple.java"); doTest(fileName); } @TestMetadata("WithCatch.java") public void testWithCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatch.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatch.java"); doTest(fileName); } @TestMetadata("WithCatchAndFinally.java") public void testWithCatchAndFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatchAndFinally.java"); doTest(fileName); } @TestMetadata("WithCatches.java") public void testWithCatches() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatches.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithCatches.java"); doTest(fileName); } @TestMetadata("WithFinally.java") public void testWithFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithFinally.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithFinally.java"); doTest(fileName); } @TestMetadata("WithReturnAtEnd.java") public void testWithReturnAtEnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnAtEnd.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass.java") public void testWithReturnInAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass.java"); doTest(fileName); } @TestMetadata("WithReturnInAnonymousClass2.java") public void testWithReturnInAnonymousClass2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/tryWithResource/WithReturnInAnonymousClass2.java"); doTest(fileName); } } @@ -4315,60 +4315,60 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TypeCastExpression extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTypeCastExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("castNullable.java") public void testCastNullable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/castNullable.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/castNullable.java"); doTest(fileName); } @TestMetadata("extendsWildcardCast.java") public void testExtendsWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/extendsWildcardCast.java"); doTest(fileName); } @TestMetadata("fooCast.java") public void testFooCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/fooCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/fooCast.java"); doTest(fileName); } @TestMetadata("intCast.java") public void testIntCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/intCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/intCast.java"); doTest(fileName); } @TestMetadata("primitiveType.java") public void testPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/primitiveType.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/primitiveType.java"); doTest(fileName); } @TestMetadata("simpleGenericCast.java") public void testSimpleGenericCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/simpleGenericCast.java"); doTest(fileName); } @TestMetadata("stringCast.java") public void testStringCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/stringCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/stringCast.java"); doTest(fileName); } @TestMetadata("superWildcardCast.java") public void testSuperWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/superWildcardCast.java"); doTest(fileName); } @TestMetadata("wildcardCast.java") public void testWildcardCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/wildcardCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeCastExpression/wildcardCast.java"); doTest(fileName); } } @@ -4378,96 +4378,96 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInTypeParameters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java") public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBounds.java") public void testClassParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java") public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/classParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassExtending.java") public void testComplexExampleWithClassExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassExtending.java"); doTest(fileName); } @TestMetadata("complexExampleWithClassMultiplyExtending.java") public void testComplexExampleWithClassMultiplyExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/complexExampleWithClassMultiplyExtending.java"); doTest(fileName); } @TestMetadata("genericClass.java") public void testGenericClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericClass.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericClass.java"); doTest(fileName); } @TestMetadata("genericParam.java") public void testGenericParam() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam.java"); doTest(fileName); } @TestMetadata("genericParam-settings.java") public void testGenericParam_settings() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam-settings.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/genericParam-settings.java"); doTest(fileName); } @TestMetadata("manyGenericParams.java") public void testManyGenericParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/manyGenericParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/manyGenericParams.java"); doTest(fileName); } @TestMetadata("methodDoubleParametrizationWithTwoBounds.java") public void testMethodDoubleParametrizationWithTwoBounds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.java"); doTest(fileName); } @TestMetadata("needTypeArgs.java") public void testNeedTypeArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/needTypeArgs.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/needTypeArgs.java"); doTest(fileName); } @TestMetadata("rawTypeCast.java") public void testRawTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/rawTypeCast.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/rawTypeCast.java"); doTest(fileName); } @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java") public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java"); doTest(fileName); } @TestMetadata("typeFromOtherFile.java") public void testTypeFromOtherFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/typeFromOtherFile.java"); doTest(fileName); } @TestMetadata("where.java") public void testWhere() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/where.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/typeParameters/where.java"); doTest(fileName); } } @@ -4477,18 +4477,18 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class VarArg extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInVarArg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/varArg"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ellipsisTypeSeveralParams.java") public void testEllipsisTypeSeveralParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.java"); doTest(fileName); } @TestMetadata("ellipsisTypeSingleParams.java") public void testEllipsisTypeSingleParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.java"); doTest(fileName); } } @@ -4498,30 +4498,30 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo @RunWith(JUnit3RunnerWithInners.class) public static class WhileStatement extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInWhileStatement() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("whileWithBlock.java") public void testWhileWithBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithBlock.java"); doTest(fileName); } @TestMetadata("whileWithEmptyBlock.java") public void testWhileWithEmptyBlock() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithEmptyBlock.java"); doTest(fileName); } @TestMetadata("whileWithExpression.java") public void testWhileWithExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithExpression.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithExpression.java"); doTest(fileName); } @TestMetadata("whileWithReturn.java") public void testWhileWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java"); + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/whileStatement/whileWithReturn.java"); doTest(fileName); } } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 4fc7d3c5c02..f7dc0e32a67 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,7 +46,7 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories import org.jetbrains.kotlin.jps.incremental.getKotlinCache -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.keysToMap import java.io.ByteArrayOutputStream @@ -461,7 +461,7 @@ public abstract class AbstractIncrementalJpsTest( } override fun logLine(message: String?) { - logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') + logBuf.append(KotlinTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') } } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 9e70025c019..649c9e544e4 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.join import java.io.File import java.util.* @@ -92,7 +92,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val actual = lines.joinToString("\n") - JetTestUtils.assertEqualsToFile(expectedFile, actual) + KotlinTestUtils.assertEqualsToFile(expectedFile, actual) } for (actualFile in compiledFiles) { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index eea8bc8cd4f..77d283f12d3 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest { public void testAllFilesPresentInCacheVersionChanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("exportedModule") public void testExportedModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); doTest(fileName); } @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); doTest(fileName); } @TestMetadata("module2Modified") public void testModule2Modified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); doTest(fileName); } @TestMetadata("moduleWithConstantModified") public void testModuleWithConstantModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); doTest(fileName); } @TestMetadata("moduleWithInlineModified") public void testModuleWithInlineModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); doTest(fileName); } @TestMetadata("touchedFile") public void testTouchedFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); doTest(fileName); } @TestMetadata("untouchedFiles") public void testUntouchedFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); doTest(fileName); } 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 896dbdd010d..72c7dff31e4 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,84 +34,84 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("circularDependencyClasses") public void testCircularDependencyClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); doTest(fileName); } @TestMetadata("circularDependencySamePackageUnchanged") public void testCircularDependencySamePackageUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); doTest(fileName); } @TestMetadata("circularDependencyTopLevelFunctions") public void testCircularDependencyTopLevelFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); doTest(fileName); } @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); doTest(fileName); } @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); doTest(fileName); } @TestMetadata("inlineFunctionTwoPackageParts") public void testInlineFunctionTwoPackageParts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); doTest(fileName); } @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); doTest(fileName); } @TestMetadata("simpleDependencyErrorOnAccessToInternal1") public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); doTest(fileName); } @TestMetadata("simpleDependencyErrorOnAccessToInternal2") public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); doTest(fileName); } @TestMetadata("simpleDependencyUnchanged") public void testSimpleDependencyUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); doTest(fileName); } @TestMetadata("transitiveDependency") public void testTransitiveDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); doTest(fileName); } @TestMetadata("transitiveInlining") public void testTransitiveInlining() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); doTest(fileName); } @TestMetadata("twoDependants") public void testTwoDependants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); doTest(fileName); } @@ -123,539 +123,539 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); doTest(fileName); } @TestMetadata("accessingFunctionsViaRenamedFileClass") public void testAccessingFunctionsViaRenamedFileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); doTest(fileName); } @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); doTest(fileName); } @TestMetadata("allConstants") public void testAllConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); doTest(fileName); } public void testAllFilesPresentInPureKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); doTest(fileName); } @TestMetadata("anonymousObjectChanged") public void testAnonymousObjectChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); doTest(fileName); } @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); doTest(fileName); } @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); doTest(fileName); } @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); doTest(fileName); } @TestMetadata("classRedeclaration") public void testClassRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); doTest(fileName); } @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); doTest(fileName); } @TestMetadata("classSignatureUnchanged") public void testClassSignatureUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedOtherPackage") public void testCompilationErrorThenFixedOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedSamePackage") public void testCompilationErrorThenFixedSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart") public void testCompilationErrorThenFixedWithPhantomPart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart2") public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart3") public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); doTest(fileName); } @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); doTest(fileName); } @TestMetadata("constantRemoved") public void testConstantRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); doTest(fileName); } @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); doTest(fileName); } @TestMetadata("defaultArguments") public void testDefaultArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); doTest(fileName); } @TestMetadata("delegatedPropertyInlineExtensionAccessor") public void testDelegatedPropertyInlineExtensionAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); doTest(fileName); } @TestMetadata("delegatedPropertyInlineMethodAccessor") public void testDelegatedPropertyInlineMethodAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); doTest(fileName); } @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); doTest(fileName); } @TestMetadata("fileWithConstantRemoved") public void testFileWithConstantRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); doTest(fileName); } @TestMetadata("fileWithInlineFunctionRemoved") public void testFileWithInlineFunctionRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); doTest(fileName); } @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); doTest(fileName); } @TestMetadata("funRedeclaration") public void testFunRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); doTest(fileName); } @TestMetadata("functionBecameInline") public void testFunctionBecameInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); doTest(fileName); } @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); doTest(fileName); } @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); doTest(fileName); } @TestMetadata("inlineFunctionsCircularDependency") public void testInlineFunctionsCircularDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); doTest(fileName); } @TestMetadata("inlineFunctionsUnchanged") public void testInlineFunctionsUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); doTest(fileName); } @TestMetadata("inlineLinesChanged") public void testInlineLinesChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); doTest(fileName); } @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); doTest(fileName); } @TestMetadata("internalClassChanged") public void testInternalClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); doTest(fileName); } @TestMetadata("internalMemberInClassChanged") public void testInternalMemberInClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); doTest(fileName); } @TestMetadata("localClassChanged") public void testLocalClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); doTest(fileName); } @TestMetadata("moveClass") public void testMoveClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); doTest(fileName); } @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); doTest(fileName); } @TestMetadata("multifileClassFileChanged") public void testMultifileClassFileChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); doTest(fileName); } @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); doTest(fileName); } @TestMetadata("multifileClassInlineFunction") public void testMultifileClassInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); doTest(fileName); } @TestMetadata("multifileClassInlineFunctionAccessingField") public void testMultifileClassInlineFunctionAccessingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); doTest(fileName); } @TestMetadata("multifileClassRecreated") public void testMultifileClassRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); doTest(fileName); } @TestMetadata("multifileClassRecreatedAfterRenaming") public void testMultifileClassRecreatedAfterRenaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); doTest(fileName); } @TestMetadata("multifileClassRemoved") public void testMultifileClassRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); doTest(fileName); } @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); doTest(fileName); } @TestMetadata("objectConstantChanged") public void testObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); doTest(fileName); } @TestMetadata("optionalParameter") public void testOptionalParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); doTest(fileName); } @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); doTest(fileName); } @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); doTest(fileName); } @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); doTest(fileName); } @TestMetadata("packageFileChangedPackage") public void testPackageFileChangedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); doTest(fileName); } @TestMetadata("packageFileChangedThenOtherRemoved") public void testPackageFileChangedThenOtherRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); doTest(fileName); } @TestMetadata("packageFileRemoved") public void testPackageFileRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); doTest(fileName); } @TestMetadata("packageFilesChangedInTurn") public void testPackageFilesChangedInTurn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); doTest(fileName); } @TestMetadata("packageInlineFunctionAccessingField") public void testPackageInlineFunctionAccessingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); doTest(fileName); } @TestMetadata("packageInlineFunctionFromOurPackage") public void testPackageInlineFunctionFromOurPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); doTest(fileName); } @TestMetadata("packageMultifileClassOneFileWithPublicChanges") public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); doTest(fileName); } @TestMetadata("packageMultifileClassPrivateOnlyChanged") public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); doTest(fileName); } @TestMetadata("packagePrivateOnlyChanged") public void testPackagePrivateOnlyChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); doTest(fileName); } @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); doTest(fileName); } @TestMetadata("packageRecreatedAfterRenaming") public void testPackageRecreatedAfterRenaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); doTest(fileName); } @TestMetadata("packageRemoved") public void testPackageRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); doTest(fileName); } @TestMetadata("privateConstantsChanged") public void testPrivateConstantsChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); doTest(fileName); } @TestMetadata("privateMethodAdded") public void testPrivateMethodAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); doTest(fileName); } @TestMetadata("privateMethodDeleted") public void testPrivateMethodDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); doTest(fileName); } @TestMetadata("privateMethodSignatureChanged") public void testPrivateMethodSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); doTest(fileName); } @TestMetadata("privateSecondaryConstructorAdded") public void testPrivateSecondaryConstructorAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); doTest(fileName); } @TestMetadata("privateSecondaryConstructorDeleted") public void testPrivateSecondaryConstructorDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); doTest(fileName); } @TestMetadata("privateValAccessorChanged") public void testPrivateValAccessorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); doTest(fileName); } @TestMetadata("privateValAdded") public void testPrivateValAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); doTest(fileName); } @TestMetadata("privateValDeleted") public void testPrivateValDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); doTest(fileName); } @TestMetadata("privateValSignatureChanged") public void testPrivateValSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); doTest(fileName); } @TestMetadata("privateVarAdded") public void testPrivateVarAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); doTest(fileName); } @TestMetadata("privateVarDeleted") public void testPrivateVarDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); doTest(fileName); } @TestMetadata("privateVarSignatureChanged") public void testPrivateVarSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); doTest(fileName); } @TestMetadata("propertyRedeclaration") public void testPropertyRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); doTest(fileName); } @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); doTest(fileName); } @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); doTest(fileName); } @TestMetadata("soleFileChangesPackage") public void testSoleFileChangesPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); doTest(fileName); } @TestMetadata("subpackage") public void testSubpackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); doTest(fileName); } @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); doTest(fileName); } @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); doTest(fileName); } @TestMetadata("topLevelPrivateValUsageAdded") public void testTopLevelPrivateValUsageAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); doTest(fileName); } @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } @TestMetadata("valAddCustomAccessor") public void testValAddCustomAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); doTest(fileName); } @TestMetadata("valRemoveCustomAccessor") public void testValRemoveCustomAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); doTest(fileName); } @@ -666,7 +666,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -674,30 +674,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("javaToKotlin") public void testJavaToKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); doTest(fileName); } @TestMetadata("javaToKotlinAndBack") public void testJavaToKotlinAndBack() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); doTest(fileName); } @TestMetadata("javaToKotlinAndRemove") public void testJavaToKotlinAndRemove() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); doTest(fileName); } @TestMetadata("kotlinToJava") public void testKotlinToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); doTest(fileName); } @@ -708,54 +708,54 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); doTest(fileName); } @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); doTest(fileName); } @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); doTest(fileName); } @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); doTest(fileName); } @TestMetadata("javaAndKotlinChangedSimultaneously") public void testJavaAndKotlinChangedSimultaneously() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); doTest(fileName); } @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); doTest(fileName); } @TestMetadata("methodRenamed") public void testMethodRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); doTest(fileName); } @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); doTest(fileName); } @@ -764,18 +764,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("methodAdded") public void testMethodAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); doTest(fileName); } @TestMetadata("methodSignatureChanged") public void testMethodSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); doTest(fileName); } @@ -788,77 +788,77 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { @TestMetadata("addOptionalParameter") public void testAddOptionalParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); doTest(fileName); } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); doTest(fileName); } @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); doTest(fileName); } @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); doTest(fileName); } @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); doTest(fileName); } @TestMetadata("funRenamed") public void testFunRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); doTest(fileName); } @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); doTest(fileName); } @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); doTest(fileName); } @TestMetadata("onlyTopLevelFunctionInFileRemoved") public void testOnlyTopLevelFunctionInFileRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); doTest(fileName); } @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); doTest(fileName); } @TestMetadata("privateChanges") public void testPrivateChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); doTest(fileName); } @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); doTest(fileName); } @@ -870,84 +870,84 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunCallSite extends AbstractIncrementalJpsTest { public void testAllFilesPresentInInlineFunCallSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classProperty") public void testClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); doTest(fileName); } @TestMetadata("companionObjectProperty") public void testCompanionObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); doTest(fileName); } @TestMetadata("function") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); doTest(fileName); } @TestMetadata("getter") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); doTest(fileName); } @TestMetadata("lambda") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); doTest(fileName); } @TestMetadata("localFun") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); doTest(fileName); } @TestMetadata("method") public void testMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); doTest(fileName); } @TestMetadata("parameterDefaultValue") public void testParameterDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); doTest(fileName); } @TestMetadata("primaryConstructorParameterDefaultValue") public void testPrimaryConstructorParameterDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); doTest(fileName); } @TestMetadata("superCall") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); doTest(fileName); } @TestMetadata("thisCall") public void testThisCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); doTest(fileName); } @TestMetadata("topLevelObjectProperty") public void testTopLevelObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); doTest(fileName); } @TestMetadata("topLevelProperty") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); doTest(fileName); } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 2b29dff9834..865585c9c52 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest { public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("class") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); doTest(fileName); } @TestMetadata("constant") public void testConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); doTest(fileName); } @TestMetadata("function") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); doTest(fileName); } @TestMetadata("inlineFunctionWithUsage") public void testInlineFunctionWithUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); doTest(fileName); } @TestMetadata("inlineFunctionWithoutUsage") public void testInlineFunctionWithoutUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); doTest(fileName); } @TestMetadata("noKotlin") public void testNoKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); doTest(fileName); } @TestMetadata("topLevelPropertyAccess") public void testTopLevelPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); doTest(fileName); } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index b4264cd694a..f8d4f8cec66 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassReader @@ -679,7 +679,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) val expectedFile = File(projectRoot, "errors.txt") - JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) + KotlinTestUtils.assertEqualsToFile(expectedFile, actualErrors) } private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 1ea148f1be4..5109411ef0a 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,49 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { public void testAllFilesPresentInLookupTracker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("classifierMembers") public void testClassifierMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/classifierMembers/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/classifierMembers/"); doTest(fileName); } @TestMetadata("conventions") public void testConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/conventions/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/conventions/"); doTest(fileName); } @TestMetadata("java") public void testJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); doTest(fileName); } @TestMetadata("localDeclarations") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); doTest(fileName); } @TestMetadata("packageDeclarations") public void testPackageDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); doTest(fileName); } @TestMetadata("syntheticProperties") public void testSyntheticProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/syntheticProperties/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/syntheticProperties/"); doTest(fileName); } - } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 920df5bb0b2..1ec16d5065e 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -22,13 +22,13 @@ import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_LOG_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { override fun setUp() { super.setUp() - workDir = JetTestUtils.tmpDirForTest(this) + workDir = KotlinTestUtils.tmpDirForTest(this) } public fun testLoadingKotlinFromDifferentModules() { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index b407aecbd46..5160563c68c 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -28,7 +28,7 @@ import java.io.File public abstract class AbstractProtoComparisonTest : UsefulTestCase() { public fun doTest(testDataPath: String) { - val testDir = JetTestUtils.tmpDir("testDirectory") + val testDir = KotlinTestUtils.tmpDir("testDirectory") val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") @@ -58,7 +58,7 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { p.printDifference(oldClassMap[name]!!, newClassMap[name]!!) } - JetTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); + KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); } private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index d6a6ae7a97d..6a90f0cbdb7 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,42 +34,42 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassSignatureChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassSignatureChange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classFlagsChanged") public void testClassFlagsChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); doTest(fileName); } @TestMetadata("classToFileFacade") public void testClassToFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); doTest(fileName); } @TestMetadata("classTypeParameterListChanged") public void testClassTypeParameterListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); doTest(fileName); } @TestMetadata("classWithClassAnnotationListChanged") public void testClassWithClassAnnotationListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); doTest(fileName); } @TestMetadata("classWithSuperTypeListChanged") public void testClassWithSuperTypeListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); doTest(fileName); } @TestMetadata("packageFacadeToClass") public void testPackageFacadeToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); doTest(fileName); } @@ -80,36 +80,36 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassPrivateOnlyChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classWithPrivateFunChanged") public void testClassWithPrivateFunChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/"); doTest(fileName); } @TestMetadata("classWithPrivatePrimaryConstructorChanged") public void testClassWithPrivatePrimaryConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateSecondaryConstructorChanged") public void testClassWithPrivateSecondaryConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateValChanged") public void testClassWithPrivateValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateVarChanged") public void testClassWithPrivateVarChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); doTest(fileName); } @@ -120,36 +120,36 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembersOnlyChanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classWithCompanionObjectChanged") public void testClassWithCompanionObjectChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/"); doTest(fileName); } @TestMetadata("classWithConstructorChanged") public void testClassWithConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithFunAndValChanged") public void testClassWithFunAndValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/"); doTest(fileName); } @TestMetadata("classWithNestedClassesChanged") public void testClassWithNestedClassesChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/"); doTest(fileName); } @TestMetadata("classWitnEnumChanged") public void testClassWitnEnumChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/"); doTest(fileName); } @@ -160,24 +160,24 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractProtoComparisonTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("packageFacadeMultifileClassChanged") public void testPackageFacadeMultifileClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); doTest(fileName); } @TestMetadata("packageFacadePrivateOnlyChanges") public void testPackageFacadePrivateOnlyChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); doTest(fileName); } @TestMetadata("packageFacadePublicChanges") public void testPackageFacadePublicChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); doTest(fileName); } @@ -188,18 +188,18 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unchanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInUnchanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("unchangedClass") public void testUnchangedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass/"); doTest(fileName); } @TestMetadata("unchangedPackageFacade") public void testUnchangedPackageFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); doTest(fileName); } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index ccc56bb75a3..7a9f6cfc73b 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.utils.PathUtil @@ -31,7 +31,7 @@ import java.io.File */ public class ClasspathOrderTest : TestCaseWithTmpdir() { companion object { - val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() + val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } public fun testClasspathOrderForCLI() { diff --git a/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 8c53fb95d41..b6198737e3e 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.Arrays; @@ -35,7 +35,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() ).asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); } public void testFiltered() throws Exception { @@ -48,7 +48,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ).asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); } public void testMultiple() throws Exception { @@ -72,6 +72,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.singleton(new File("cp12")) ); String actual = builder.asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); } } 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 92e4d822247..254d1794703 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 @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPsiFactory; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.IOException; @@ -106,7 +106,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { } File outDir = new File(getOutputPath()); - JetTestUtils.mkdirs(outDir); + KotlinTestUtils.mkdirs(outDir); } @Override 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 9f0172dd596..2c7983e4f61 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,251 +33,251 @@ import java.util.regex.Pattern; public class BridgeTestGenerated extends AbstractBridgeTest { @TestMetadata("objectClone.kt") public void ignoredObjectClone() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/objectClone.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/objectClone.kt"); doTest(fileName); } public void testAllFilesPresentInBridges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("complexMultiInheritance.kt") public void testComplexMultiInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt"); doTest(fileName); } @TestMetadata("complexTraitImpl.kt") public void testComplexTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexTraitImpl.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegation.kt"); doTest(fileName); } @TestMetadata("delegationProperty.kt") public void testDelegationProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegationProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegationProperty.kt"); doTest(fileName); } @TestMetadata("diamond.kt") public void testDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/diamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/diamond.kt"); doTest(fileName); } @TestMetadata("fakeCovariantOverride.kt") public void testFakeCovariantOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt"); doTest(fileName); } @TestMetadata("fakeGenericCovariantOverride.kt") public void testFakeGenericCovariantOverride() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt"); doTest(fileName); } @TestMetadata("fakeGenericCovariantOverrideWithDelegation.kt") public void testFakeGenericCovariantOverrideWithDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverrideWithDelegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverrideWithDelegation.kt"); doTest(fileName); } @TestMetadata("fakeOverrideOfTraitImpl.kt") public void testFakeOverrideOfTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt"); doTest(fileName); } @TestMetadata("fakeOverrideWithSeveralSuperDeclarations.kt") public void testFakeOverrideWithSeveralSuperDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt"); doTest(fileName); } @TestMetadata("fakeOverrideWithSynthesizedImplementation.kt") public void testFakeOverrideWithSynthesizedImplementation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt"); doTest(fileName); } @TestMetadata("genericProperty.kt") public void testGenericProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/genericProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/genericProperty.kt"); doTest(fileName); } @TestMetadata("kt1939.kt") public void testKt1939() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1939.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1939.kt"); doTest(fileName); } @TestMetadata("kt1959.kt") public void testKt1959() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1959.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1959.kt"); doTest(fileName); } @TestMetadata("kt2498.kt") public void testKt2498() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2498.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2498.kt"); doTest(fileName); } @TestMetadata("kt2702.kt") public void testKt2702() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2702.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2702.kt"); doTest(fileName); } @TestMetadata("kt2833.kt") public void testKt2833() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2833.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2833.kt"); doTest(fileName); } @TestMetadata("kt2920.kt") public void testKt2920() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2920.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2920.kt"); doTest(fileName); } @TestMetadata("kt318.kt") public void testKt318() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt318.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt318.kt"); doTest(fileName); } @TestMetadata("longChainOneBridge.kt") public void testLongChainOneBridge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/longChainOneBridge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/longChainOneBridge.kt"); doTest(fileName); } @TestMetadata("manyTypeArgumentsSubstitutedSuccessively.kt") public void testManyTypeArgumentsSubstitutedSuccessively() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt"); doTest(fileName); } @TestMetadata("methodFromTrait.kt") public void testMethodFromTrait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/methodFromTrait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/methodFromTrait.kt"); doTest(fileName); } @TestMetadata("noBridgeOnMutableCollectionInheritance.kt") public void testNoBridgeOnMutableCollectionInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt"); doTest(fileName); } @TestMetadata("overrideAbstractProperty.kt") public void testOverrideAbstractProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt"); doTest(fileName); } @TestMetadata("overrideReturnType.kt") public void testOverrideReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideReturnType.kt"); doTest(fileName); } @TestMetadata("propertyAccessorsWithoutBody.kt") public void testPropertyAccessorsWithoutBody() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt"); doTest(fileName); } @TestMetadata("propertyDiamond.kt") public void testPropertyDiamond() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyDiamond.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyDiamond.kt"); doTest(fileName); } @TestMetadata("propertyInConstructor.kt") public void testPropertyInConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyInConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyInConstructor.kt"); doTest(fileName); } @TestMetadata("propertySetter.kt") public void testPropertySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertySetter.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertySetter.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simple.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleEnum.kt"); doTest(fileName); } @TestMetadata("simpleGenericMethod.kt") public void testSimpleGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt"); doTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleObject.kt"); doTest(fileName); } @TestMetadata("simpleReturnType.kt") public void testSimpleReturnType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleReturnType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleReturnType.kt"); doTest(fileName); } @TestMetadata("simpleTraitImpl.kt") public void testSimpleTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt"); doTest(fileName); } @TestMetadata("simpleUpperBound.kt") public void testSimpleUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleUpperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleUpperBound.kt"); doTest(fileName); } @TestMetadata("strListContains.kt") public void testStrListContains() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/strListContains.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/strListContains.kt"); doTest(fileName); } @TestMetadata("traitImplInheritsTraitImpl.kt") public void testTraitImplInheritsTraitImpl() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt"); doTest(fileName); } @TestMetadata("twoParentsWithDifferentMethodsTwoBridges.kt") public void testTwoParentsWithDifferentMethodsTwoBridges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt"); doTest(fileName); } @TestMetadata("twoParentsWithTheSameMethodOneBridge.kt") public void testTwoParentsWithTheSameMethodOneBridge() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt"); doTest(fileName); } @@ -287,59 +287,59 @@ public class BridgeTestGenerated extends AbstractBridgeTest { public static class SubstitutionInSuperClass extends AbstractBridgeTest { @TestMetadata("abstractFun.kt") public void testAbstractFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt"); doTest(fileName); } public void testAllFilesPresentInSubstitutionInSuperClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges/substitutionInSuperClass"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges/substitutionInSuperClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("boundedTypeArguments.kt") public void testBoundedTypeArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt"); doTest(fileName); } @TestMetadata("delegation.kt") public void testDelegation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt"); doTest(fileName); } @TestMetadata("enum.kt") public void testEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt"); doTest(fileName); } @TestMetadata("genericMethod.kt") public void testGenericMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt"); doTest(fileName); } @TestMetadata("property.kt") public void testProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt"); doTest(fileName); } @TestMetadata("upperBound.kt") public void testUpperBound() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java index ae912314fb1..5154f152976 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class CompanionObjectTestGenerated extends AbstractCompanionObjectTest { public void testAllFilesPresentInObjectIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objectIntrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("objects.kt") public void testObjects() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objectIntrinsics/objects.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/objectIntrinsics/objects.kt"); doTest(fileName); } } 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 3724673eb3d..9c6390d4ad9 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,126 +32,126 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DynamicTestGenerated extends AbstractDynamicTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/dynamic/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/dynamic/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("binaryOperations.kt") public void testBinaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/binaryOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/binaryOperations.kt"); doTest(fileName); } @TestMetadata("callGetMethod.kt") public void testCallGetMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callGetMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callGetMethod.kt"); doTest(fileName); } @TestMetadata("callMethods.kt") public void testCallMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callMethods.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callMethods.kt"); doTest(fileName); } @TestMetadata("callSetMethod.kt") public void testCallSetMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callSetMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/callSetMethod.kt"); doTest(fileName); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/compareTo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/compareTo.kt"); doTest(fileName); } @TestMetadata("equals.kt") public void testEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/equals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/equals.kt"); doTest(fileName); } @TestMetadata("getByBrackets.kt") public void testGetByBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/getByBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/getByBrackets.kt"); doTest(fileName); } @TestMetadata("identityEquals.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/identityEquals.kt"); doTest(fileName); } @TestMetadata("in.kt") public void testIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/in.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/in.kt"); doTest(fileName); } @TestMetadata("incrementAndDecrement.kt") public void testIncrementAndDecrement() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/incrementAndDecrement.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/incrementAndDecrement.kt"); doTest(fileName); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/infixCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/infixCall.kt"); doTest(fileName); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/invoke.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/invoke.kt"); doTest(fileName); } @TestMetadata("is.kt") public void testIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/is.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/is.kt"); doTest(fileName); } @TestMetadata("isJsPrimitiveType.kt") public void testIsJsPrimitiveType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/isJsPrimitiveType.kt"); doTest(fileName); } @TestMetadata("iterator.kt") public void testIterator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/iterator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/iterator.kt"); doTest(fileName); } @TestMetadata("nameClashing.kt") public void testNameClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/nameClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/nameClashing.kt"); doTest(fileName); } @TestMetadata("operationsWithAssignment.kt") public void testOperationsWithAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/operationsWithAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/operationsWithAssignment.kt"); doTest(fileName); } @TestMetadata("propertyAccess.kt") public void testPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/propertyAccess.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/propertyAccess.kt"); doTest(fileName); } @TestMetadata("setByBrackets.kt") public void testSetByBrackets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/setByBrackets.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/setByBrackets.kt"); doTest(fileName); } @TestMetadata("unaryOperations.kt") public void testUnaryOperations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/unaryOperations.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/dynamic/cases/unaryOperations.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionExpressionTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionExpressionTestGenerated.java index e60ee537fba..897eb1f983b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionExpressionTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/FunctionExpressionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,24 +32,24 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class FunctionExpressionTestGenerated extends AbstractFunctionExpressionTest { public void testAllFilesPresentInFunctionExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/functionExpression"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/functionExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("functionExpression.kt") public void testFunctionExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpression.kt"); doTest(fileName); } @TestMetadata("functionExpressionWithThisReference.kt") public void testFunctionExpressionWithThisReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionExpressionWithThisReference.kt"); doTest(fileName); } @TestMetadata("functionLiteralExpression.kt") public void testFunctionLiteralExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionLiteralExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression/functionLiteralExpression.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineEvaluationOrderTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineEvaluationOrderTestGenerated.java index 7783c249453..8c5f1d15c19 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineEvaluationOrderTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineEvaluationOrderTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,228 +32,228 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineEvaluationOrderTestGenerated extends AbstractInlineEvaluationOrderTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineEvaluationOrder/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineEvaluationOrder/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("argumentOfCall.kt") public void testArgumentOfCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfCall.kt"); doTest(fileName); } @TestMetadata("argumentOfCallMultipleInlineCalls.kt") public void testArgumentOfCallMultipleInlineCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfCallMultipleInlineCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfCallMultipleInlineCalls.kt"); doTest(fileName); } @TestMetadata("argumentOfInlineCall.kt") public void testArgumentOfInlineCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfInlineCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfInlineCall.kt"); doTest(fileName); } @TestMetadata("argumentOfNew.kt") public void testArgumentOfNew() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfNew.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/argumentOfNew.kt"); doTest(fileName); } @TestMetadata("arrayAccess1.kt") public void testArrayAccess1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess1.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess1.kt"); doTest(fileName); } @TestMetadata("arrayAccess2.kt") public void testArrayAccess2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess2.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess2.kt"); doTest(fileName); } @TestMetadata("arrayAccess3.kt") public void testArrayAccess3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess3.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayAccess3.kt"); doTest(fileName); } @TestMetadata("arrayLiteral.kt") public void testArrayLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteral.kt"); doTest(fileName); } @TestMetadata("arrayLiteralMultipleInlineCalls.kt") public void testArrayLiteralMultipleInlineCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteralMultipleInlineCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteralMultipleInlineCalls.kt"); doTest(fileName); } @TestMetadata("arrayLiteralNested.kt") public void testArrayLiteralNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteralNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/arrayLiteralNested.kt"); doTest(fileName); } @TestMetadata("assignment.kt") public void testAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/assignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/assignment.kt"); doTest(fileName); } @TestMetadata("binaryOperator.kt") public void testBinaryOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/binaryOperator.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/binaryOperator.kt"); doTest(fileName); } @TestMetadata("binaryOperatorMultipleInlineCalls.kt") public void testBinaryOperatorMultipleInlineCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/binaryOperatorMultipleInlineCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/binaryOperatorMultipleInlineCalls.kt"); doTest(fileName); } @TestMetadata("callQualifier.kt") public void testCallQualifier() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/callQualifier.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/callQualifier.kt"); doTest(fileName); } @TestMetadata("callQualifierComplex.kt") public void testCallQualifierComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/callQualifierComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/callQualifierComplex.kt"); doTest(fileName); } @TestMetadata("conditional.kt") public void testConditional() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditional.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditional.kt"); doTest(fileName); } @TestMetadata("conditionalElvis.kt") public void testConditionalElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalElvis.kt"); doTest(fileName); } @TestMetadata("conditionalNested.kt") public void testConditionalNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalNested.kt"); doTest(fileName); } @TestMetadata("conditionalTestExpression.kt") public void testConditionalTestExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalTestExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalTestExpression.kt"); doTest(fileName); } @TestMetadata("conditionalTestExpressionElvis.kt") public void testConditionalTestExpressionElvis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalTestExpressionElvis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/conditionalTestExpressionElvis.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/doWhile.kt"); doTest(fileName); } @TestMetadata("doWhileComplex.kt") public void testDoWhileComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/doWhileComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/doWhileComplex.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/for.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/if.kt"); doTest(fileName); } @TestMetadata("lambdaWithClosure.kt") public void testLambdaWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/lambdaWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/lambdaWithClosure.kt"); doTest(fileName); } @TestMetadata("logicalAnd.kt") public void testLogicalAnd() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalAnd.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalAnd.kt"); doTest(fileName); } @TestMetadata("logicalAndOrMultipleInlineCalls.kt") public void testLogicalAndOrMultipleInlineCalls() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalAndOrMultipleInlineCalls.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalAndOrMultipleInlineCalls.kt"); doTest(fileName); } @TestMetadata("logicalOr.kt") public void testLogicalOr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalOr.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/logicalOr.kt"); doTest(fileName); } @TestMetadata("methodCallQualifierWithSideEffect.kt") public void testMethodCallQualifierWithSideEffect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/methodCallQualifierWithSideEffect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/methodCallQualifierWithSideEffect.kt"); doTest(fileName); } @TestMetadata("methodInlineCallQualifierWithSideEffect.kt") public void testMethodInlineCallQualifierWithSideEffect() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/methodInlineCallQualifierWithSideEffect.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/methodInlineCallQualifierWithSideEffect.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("multiDeclarationComplex.kt") public void testMultiDeclarationComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/multiDeclarationComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/multiDeclarationComplex.kt"); doTest(fileName); } @TestMetadata("nestedInlineCall.kt") public void testNestedInlineCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/nestedInlineCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/nestedInlineCall.kt"); doTest(fileName); } @TestMetadata("propertiesInitializationOrder.kt") public void testPropertiesInitializationOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/propertiesInitializationOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/propertiesInitializationOrder.kt"); doTest(fileName); } @TestMetadata("propertiesInitializationOrderSimple.kt") public void testPropertiesInitializationOrderSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/propertiesInitializationOrderSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/propertiesInitializationOrderSimple.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/while.kt"); doTest(fileName); } @TestMetadata("whileComplex.kt") public void testWhileComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/whileComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineEvaluationOrder/cases/whileComplex.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java index 28cac662bba..c0523d449c0 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,54 +32,54 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineJsStdlibTestGenerated extends AbstractInlineJsStdlibTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineStdlib/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineStdlib/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callNameClash.kt") public void testCallNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/callNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/callNameClash.kt"); doTest(fileName); } @TestMetadata("callableRefToFunInCurrentModule.kt") public void testCallableRefToFunInCurrentModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/callableRefToFunInCurrentModule.kt"); doTest(fileName); } @TestMetadata("closure.kt") public void testClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closure.kt"); doTest(fileName); } @TestMetadata("closureInObjectLiteral.kt") public void testClosureInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closureInObjectLiteral.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closureInObjectLiteral.kt"); doTest(fileName); } @TestMetadata("closureNested.kt") public void testClosureNested() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closureNested.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/closureNested.kt"); doTest(fileName); } @TestMetadata("localNamesClash.kt") public void testLocalNamesClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/localNamesClash.kt"); doTest(fileName); } @TestMetadata("simple.kt") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/simple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/simple.kt"); doTest(fileName); } @TestMetadata("thisInExtension.kt") public void testThisInExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineStdlib/cases/thisInExtension.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java index 3c6b8216c95..0243c7e0063 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,342 +32,342 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineJsTestGenerated extends AbstractInlineJsTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inline/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inline/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("anonymousObjectInlineMethod.kt") public void testAnonymousObjectInlineMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/anonymousObjectInlineMethod.kt"); doTest(fileName); } @TestMetadata("arrayLiteralAliasing.kt") public void testArrayLiteralAliasing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/arrayLiteralAliasing.kt"); doTest(fileName); } @TestMetadata("astCopy.kt") public void testAstCopy() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/astCopy.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/astCopy.kt"); doTest(fileName); } @TestMetadata("callInlineFunctionOnTopLevel.kt") public void testCallInlineFunctionOnTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callInlineFunctionOnTopLevel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callInlineFunctionOnTopLevel.kt"); doTest(fileName); } @TestMetadata("callInlineFunctionOnTopLevelSimple.kt") public void testCallInlineFunctionOnTopLevelSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callInlineFunctionOnTopLevelSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callInlineFunctionOnTopLevelSimple.kt"); doTest(fileName); } @TestMetadata("callableReference.kt") public void testCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callableReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callableReference.kt"); doTest(fileName); } @TestMetadata("callableReferenceOfLocalInline.kt") public void testCallableReferenceOfLocalInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/callableReferenceOfLocalInline.kt"); doTest(fileName); } @TestMetadata("classObject.kt") public void testClassObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/classObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/classObject.kt"); doTest(fileName); } @TestMetadata("expressionBodyWithLambdaCall.kt") public void testExpressionBodyWithLambdaCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt"); doTest(fileName); } @TestMetadata("extension.kt") public void testExtension() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/extension.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/extension.kt"); doTest(fileName); } @TestMetadata("extensionWithManyArguments.kt") public void testExtensionWithManyArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/extensionWithManyArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/extensionWithManyArguments.kt"); doTest(fileName); } @TestMetadata("identityEquals.kt") public void testIdentityEquals() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/identityEquals.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/identityEquals.kt"); doTest(fileName); } @TestMetadata("incrementProperty.kt") public void testIncrementProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/incrementProperty.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/incrementProperty.kt"); doTest(fileName); } @TestMetadata("inlineCallNoInline.kt") public void testInlineCallNoInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineCallNoInline.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineCallNoInline.kt"); doTest(fileName); } @TestMetadata("inlineChain.kt") public void testInlineChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineChain.kt"); doTest(fileName); } @TestMetadata("inlineChainWithFewStatements.kt") public void testInlineChainWithFewStatements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineChainWithFewStatements.kt"); doTest(fileName); } @TestMetadata("inlineDefaultArgument.kt") public void testInlineDefaultArgument() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineDefaultArgument.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineDefaultArgument.kt"); doTest(fileName); } @TestMetadata("inlineFunctionInLambda.kt") public void testInlineFunctionInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineFunctionInLambda.kt"); doTest(fileName); } @TestMetadata("inlineGenericSimple.kt") public void testInlineGenericSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineGenericSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineGenericSimple.kt"); doTest(fileName); } @TestMetadata("inlineIf.kt") public void testInlineIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineIf.kt"); doTest(fileName); } @TestMetadata("inlineInc.kt") public void testInlineInc() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineInc.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineInc.kt"); doTest(fileName); } @TestMetadata("inlineIntSimple.kt") public void testInlineIntSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineIntSimple.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineIntSimple.kt"); doTest(fileName); } @TestMetadata("inlineLambdaNoCapture.kt") public void testInlineLambdaNoCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineLambdaNoCapture.kt"); doTest(fileName); } @TestMetadata("inlineLambdaWithCapture.kt") public void testInlineLambdaWithCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineLambdaWithCapture.kt"); doTest(fileName); } @TestMetadata("inlineMethod.kt") public void testInlineMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineMethod.kt"); doTest(fileName); } @TestMetadata("inlineNoReturn.kt") public void testInlineNoReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineNoReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineNoReturn.kt"); doTest(fileName); } @TestMetadata("inlineOrder.kt") public void testInlineOrder() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineOrder.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineOrder.kt"); doTest(fileName); } @TestMetadata("inlineSimpleAssignment.kt") public void testInlineSimpleAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineSimpleAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/inlineSimpleAssignment.kt"); doTest(fileName); } @TestMetadata("jsCode.kt") public void testJsCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/jsCode.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/jsCode.kt"); doTest(fileName); } @TestMetadata("jsCodeVarDeclared.kt") public void testJsCodeVarDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/jsCodeVarDeclared.kt"); doTest(fileName); } @TestMetadata("lambdaInLambda.kt") public void testLambdaInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaInLambda.kt"); doTest(fileName); } @TestMetadata("lambdaReassignment.kt") public void testLambdaReassignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaReassignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaReassignment.kt"); doTest(fileName); } @TestMetadata("lambdaReassignmentWithCapture.kt") public void testLambdaReassignmentWithCapture() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaReassignmentWithCapture.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/lambdaReassignmentWithCapture.kt"); doTest(fileName); } @TestMetadata("localInlineExtensionFunction.kt") public void testLocalInlineExtensionFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineExtensionFunction.kt"); doTest(fileName); } @TestMetadata("localInlineFunction.kt") public void testLocalInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunction.kt"); doTest(fileName); } @TestMetadata("localInlineFunctionComplex.kt") public void testLocalInlineFunctionComplex() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionComplex.kt"); doTest(fileName); } @TestMetadata("localInlineFunctionDeclaredInLambda.kt") public void testLocalInlineFunctionDeclaredInLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionDeclaredInLambda.kt"); doTest(fileName); } @TestMetadata("localInlineFunctionNameClash.kt") public void testLocalInlineFunctionNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionNameClash.kt"); doTest(fileName); } @TestMetadata("localInlineFunctionReference.kt") public void testLocalInlineFunctionReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionReference.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/localInlineFunctionReference.kt"); doTest(fileName); } @TestMetadata("metadataForPublicFunction.kt") public void testMetadataForPublicFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/metadataForPublicFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/metadataForPublicFunction.kt"); doTest(fileName); } @TestMetadata("multiDeclaration.kt") public void testMultiDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/multiDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/multiDeclaration.kt"); doTest(fileName); } @TestMetadata("noInlineLambda.kt") public void testNoInlineLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/noInlineLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/noInlineLambda.kt"); doTest(fileName); } @TestMetadata("params.kt") public void testParams() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/params.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/params.kt"); doTest(fileName); } @TestMetadata("rootConstructor.kt") public void testRootConstructor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/rootConstructor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/rootConstructor.kt"); doTest(fileName); } @TestMetadata("severalClosures.kt") public void testSeveralClosures() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/severalClosures.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/severalClosures.kt"); doTest(fileName); } @TestMetadata("severalUsage.kt") public void testSeveralUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/severalUsage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/severalUsage.kt"); doTest(fileName); } @TestMetadata("simpleDouble.kt") public void testSimpleDouble() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleDouble.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleDouble.kt"); doTest(fileName); } @TestMetadata("simpleEnum.kt") public void testSimpleEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleEnum.kt"); doTest(fileName); } @TestMetadata("simpleInt.kt") public void testSimpleInt() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleInt.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleInt.kt"); doTest(fileName); } @TestMetadata("simpleLambda.kt") public void testSimpleLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleLambda.kt"); doTest(fileName); } @TestMetadata("simpleObject.kt") public void testSimpleObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleObject.kt"); doTest(fileName); } @TestMetadata("simpleReturnFunctionWithResultUnused.kt") public void testSimpleReturnFunctionWithResultUnused() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleReturnFunctionWithResultUnused.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/simpleReturnFunctionWithResultUnused.kt"); doTest(fileName); } @TestMetadata("statementsAfterReturn.kt") public void testStatementsAfterReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/statementsAfterReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/statementsAfterReturn.kt"); doTest(fileName); } @TestMetadata("thisImplicitlyCaptured.kt") public void testThisImplicitlyCaptured() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/thisImplicitlyCaptured.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/thisImplicitlyCaptured.kt"); doTest(fileName); } @TestMetadata("thisLiteralAliasing.kt") public void testThisLiteralAliasing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/thisLiteralAliasing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/thisLiteralAliasing.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inline/cases/vararg.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiModuleTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiModuleTestGenerated.java index 066c7ccaa8a..09d2a8f2d4e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiModuleTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineMultiModuleTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,66 +32,66 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineMultiModuleTestGenerated extends AbstractInlineMultiModuleTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineMultiModule/cases"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineMultiModule/cases"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("anotherModuleValInClosure") public void testAnotherModuleValInClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/anotherModuleValInClosure/"); doTest(fileName); } @TestMetadata("callableReference") public void testCallableReference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/callableReference/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/callableReference/"); doTest(fileName); } @TestMetadata("calledByFqName") public void testCalledByFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/calledByFqName/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/calledByFqName/"); doTest(fileName); } @TestMetadata("extensionLambda") public void testExtensionLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/extensionLambda/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/extensionLambda/"); doTest(fileName); } @TestMetadata("lambda") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambda/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambda/"); doTest(fileName); } @TestMetadata("lambdaCalledInObjectLiteral") public void testLambdaCalledInObjectLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambdaCalledInObjectLiteral/"); doTest(fileName); } @TestMetadata("lambdaWithClosure") public void testLambdaWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/lambdaWithClosure/"); doTest(fileName); } @TestMetadata("localNameClash") public void testLocalNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/localNameClash/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/localNameClash/"); doTest(fileName); } @TestMetadata("method") public void testMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/method/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/method/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineMultiModule/cases/simple/"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java index a456338cdb5..c8ac6d76173 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineSizeReductionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class InlineSizeReductionTestGenerated extends AbstractInlineSizeReductionTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineSizeReduction/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/inlineSizeReduction/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("lastBreak.kt") public void testLastBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/lastBreak.kt"); doTest(fileName); } @TestMetadata("oneTopLevelReturn.kt") public void testOneTopLevelReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/oneTopLevelReturn.kt"); doTest(fileName); } @TestMetadata("returnInlineCall.kt") public void testReturnInlineCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/returnInlineCall.kt"); doTest(fileName); } @TestMetadata("simpleReturnFunction.kt") public void testSimpleReturnFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/simpleReturnFunction.kt"); doTest(fileName); } @TestMetadata("this.kt") public void testThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/this.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/this.kt"); doTest(fileName); } @TestMetadata("valAssignment.kt") public void testValAssignment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/valAssignment.kt"); doTest(fileName); } @TestMetadata("valDeclaration.kt") public void testValDeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/inlineSizeReduction/cases/valDeclaration.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java index 100585fdfd2..5f1ac025bef 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,138 +32,138 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class JsCodeTestGenerated extends AbstractJsCodeTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/jsCode/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/jsCode/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("break.kt") public void testBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/break.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/break.kt"); doTest(fileName); } @TestMetadata("catchScope.kt") public void testCatchScope() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/catchScope.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/catchScope.kt"); doTest(fileName); } @TestMetadata("codeFromVariable.kt") public void testCodeFromVariable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/codeFromVariable.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/codeFromVariable.kt"); doTest(fileName); } @TestMetadata("continue.kt") public void testContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/continue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/continue.kt"); doTest(fileName); } @TestMetadata("doWhile.kt") public void testDoWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/doWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/doWhile.kt"); doTest(fileName); } @TestMetadata("for.kt") public void testFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/for.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/for.kt"); doTest(fileName); } @TestMetadata("forIn.kt") public void testForIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/forIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/forIn.kt"); doTest(fileName); } @TestMetadata("function.kt") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/function.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/function.kt"); doTest(fileName); } @TestMetadata("if.kt") public void testIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/if.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/if.kt"); doTest(fileName); } @TestMetadata("invocation.kt") public void testInvocation() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/invocation.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/invocation.kt"); doTest(fileName); } @TestMetadata("label.kt") public void testLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/label.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/label.kt"); doTest(fileName); } @TestMetadata("labelNestedClash.kt") public void testLabelNestedClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelNestedClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelNestedClash.kt"); doTest(fileName); } @TestMetadata("labelNestedClashWithKotlin.kt") public void testLabelNestedClashWithKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelNestedClashWithKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelNestedClashWithKotlin.kt"); doTest(fileName); } @TestMetadata("labelSiblingClash.kt") public void testLabelSiblingClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelSiblingClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/labelSiblingClash.kt"); doTest(fileName); } @TestMetadata("literal.kt") public void testLiteral() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/literal.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/literal.kt"); doTest(fileName); } @TestMetadata("object.kt") public void testObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/object.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/object.kt"); doTest(fileName); } @TestMetadata("objectScopes.kt") public void testObjectScopes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/objectScopes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/objectScopes.kt"); doTest(fileName); } @TestMetadata("operators.kt") public void testOperators() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/operators.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/operators.kt"); doTest(fileName); } @TestMetadata("quotes.kt") public void testQuotes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/quotes.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/quotes.kt"); doTest(fileName); } @TestMetadata("switch.kt") public void testSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/switch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/switch.kt"); doTest(fileName); } @TestMetadata("tryCatchFinally.kt") public void testTryCatchFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/tryCatchFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/tryCatchFinally.kt"); doTest(fileName); } @TestMetadata("while.kt") public void testWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/while.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/jsCode/cases/while.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java index a5073ba2990..eae7bcc2375 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,66 +32,66 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LabelTestGenerated extends AbstractLabelTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/labels/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/labels/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("labelOnExpression.kt") public void testLabelOnExpression() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/labelOnExpression.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/labelOnExpression.kt"); doTest(fileName); } @TestMetadata("labelWithVariableClashing.kt") public void testLabelWithVariableClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/labelWithVariableClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/labelWithVariableClashing.kt"); doTest(fileName); } @TestMetadata("nestedLabels.kt") public void testNestedLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabels.kt"); doTest(fileName); } @TestMetadata("nestedLabelsInlinedClashing.kt") public void testNestedLabelsInlinedClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabelsInlinedClashing.kt"); doTest(fileName); } @TestMetadata("nestedLabelsInlinedClashingAtFunctionsWithClosure.kt") public void testNestedLabelsInlinedClashingAtFunctionsWithClosure() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/nestedLabelsInlinedClashingAtFunctionsWithClosure.kt"); doTest(fileName); } @TestMetadata("siblingLabels.kt") public void testSiblingLabels() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabels.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabels.kt"); doTest(fileName); } @TestMetadata("siblingLabelsInlined.kt") public void testSiblingLabelsInlined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabelsInlined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabelsInlined.kt"); doTest(fileName); } @TestMetadata("siblingLabelsInlinedClashing.kt") public void testSiblingLabelsInlinedClashing() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabelsInlinedClashing.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/siblingLabelsInlinedClashing.kt"); doTest(fileName); } @TestMetadata("simpleLabel.kt") public void testSimpleLabel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/simpleLabel.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/simpleLabel.kt"); doTest(fileName); } @TestMetadata("simpleLabelInlined.kt") public void testSimpleLabelInlined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/simpleLabelInlined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/labels/cases/simpleLabelInlined.kt"); doTest(fileName); } } 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 fa981e7addb..c67087487a1 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class MultiModuleTestGenerated extends AbstractMultiModuleTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/multiModule/cases"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/multiModule/cases"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("useElementsFromDefaultPackageInAnotherModule") public void testUseElementsFromDefaultPackageInAnotherModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/useElementsFromDefaultPackageInAnotherModule/"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/useElementsFromDefaultPackageInAnotherModule/"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReifiedTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReifiedTestGenerated.java index 6eba0e01c1f..ba5f7532011 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReifiedTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReifiedTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,108 +32,108 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReifiedTestGenerated extends AbstractReifiedTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reified/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reified/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callChain.kt") public void testCallChain() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/callChain.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/callChain.kt"); doTest(fileName); } @TestMetadata("extensionFun.kt") public void testExtensionFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionFun.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionFun.kt"); doTest(fileName); } @TestMetadata("extensionLambda.kt") public void testExtensionLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionLambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionLambda.kt"); doTest(fileName); } @TestMetadata("extensionMethod.kt") public void testExtensionMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionMethod.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/extensionMethod.kt"); doTest(fileName); } @TestMetadata("innerObject.kt") public void testInnerObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/innerObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/innerObject.kt"); doTest(fileName); } @TestMetadata("isBool.kt") public void testIsBool() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isBool.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isBool.kt"); doTest(fileName); } @TestMetadata("isChar.kt") public void testIsChar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isChar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isChar.kt"); doTest(fileName); } @TestMetadata("isClass.kt") public void testIsClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isClass.kt"); doTest(fileName); } @TestMetadata("isNumber.kt") public void testIsNumber() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isNumber.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isNumber.kt"); doTest(fileName); } @TestMetadata("isString.kt") public void testIsString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isString.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/isString.kt"); doTest(fileName); } @TestMetadata("lambda.kt") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/lambda.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/lambda.kt"); doTest(fileName); } @TestMetadata("lambdaNameClash.kt") public void testLambdaNameClash() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/lambdaNameClash.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/lambdaNameClash.kt"); doTest(fileName); } @TestMetadata("method.kt") public void testMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/method.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/method.kt"); doTest(fileName); } @TestMetadata("multipleTypeParameters.kt") public void testMultipleTypeParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/multipleTypeParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/multipleTypeParameters.kt"); doTest(fileName); } @TestMetadata("noValueParameters.kt") public void testNoValueParameters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/noValueParameters.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/noValueParameters.kt"); doTest(fileName); } @TestMetadata("parameterSwap.kt") public void testParameterSwap() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/parameterSwap.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/parameterSwap.kt"); doTest(fileName); } @TestMetadata("vararg.kt") public void testVararg() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/vararg.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reified/cases/vararg.kt"); doTest(fileName); } } 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 907d84c9bc1..da490e805a4 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,1038 +32,1038 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ReservedWordTestGenerated extends AbstractReservedWordTest { public void testAllFilesPresentInCases() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("js/js.translator/testData/reservedWords/cases"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("dataClassValBreak.kt") public void testDataClassValBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValBreak.kt"); doTest(fileName); } @TestMetadata("dataClassValClass.kt") public void testDataClassValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValClass.kt"); doTest(fileName); } @TestMetadata("dataClassValUndefined.kt") public void testDataClassValUndefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValUndefined.kt"); doTest(fileName); } @TestMetadata("dataClassValVoid.kt") public void testDataClassValVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassValVoid.kt"); doTest(fileName); } @TestMetadata("dataClassVarContinue.kt") public void testDataClassVarContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarContinue.kt"); doTest(fileName); } @TestMetadata("dataClassVarDo.kt") public void testDataClassVarDo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarDo.kt"); doTest(fileName); } @TestMetadata("dataClassVarWith.kt") public void testDataClassVarWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarWith.kt"); doTest(fileName); } @TestMetadata("dataClassVarYield.kt") public void testDataClassVarYield() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/dataClassVarYield.kt"); doTest(fileName); } @TestMetadata("delegatedFunCatch.kt") public void testDelegatedFunCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt"); doTest(fileName); } @TestMetadata("delegatedFunConst.kt") public void testDelegatedFunConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt"); doTest(fileName); } @TestMetadata("delegatedFunNull.kt") public void testDelegatedFunNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt"); doTest(fileName); } @TestMetadata("delegatedFunPackage.kt") public void testDelegatedFunPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt"); doTest(fileName); } @TestMetadata("delegatedFunParamDebugger.kt") public void testDelegatedFunParamDebugger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDebugger.kt"); doTest(fileName); } @TestMetadata("delegatedFunParamDefault.kt") public void testDelegatedFunParamDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamDefault.kt"); doTest(fileName); } @TestMetadata("delegatedFunParamReturn.kt") public void testDelegatedFunParamReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamReturn.kt"); doTest(fileName); } @TestMetadata("delegatedFunParamSuper.kt") public void testDelegatedFunParamSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedFunParamSuper.kt"); doTest(fileName); } @TestMetadata("delegatedLabelDelete.kt") public void testDelegatedLabelDelete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelDelete.kt"); doTest(fileName); } @TestMetadata("delegatedLabelEnum.kt") public void testDelegatedLabelEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelEnum.kt"); doTest(fileName); } @TestMetadata("delegatedLabelThis.kt") public void testDelegatedLabelThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThis.kt"); doTest(fileName); } @TestMetadata("delegatedLabelThrow.kt") public void testDelegatedLabelThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedLabelThrow.kt"); doTest(fileName); } @TestMetadata("delegatedValArguments.kt") public void testDelegatedValArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValArguments.kt"); doTest(fileName); } @TestMetadata("delegatedValFor.kt") public void testDelegatedValFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValFor.kt"); doTest(fileName); } @TestMetadata("delegatedValIf.kt") public void testDelegatedValIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValIf.kt"); doTest(fileName); } @TestMetadata("delegatedValNaN.kt") public void testDelegatedValNaN() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedValNaN.kt"); doTest(fileName); } @TestMetadata("delegatedVarAwait.kt") public void testDelegatedVarAwait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarAwait.kt"); doTest(fileName); } @TestMetadata("delegatedVarCase.kt") public void testDelegatedVarCase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarCase.kt"); doTest(fileName); } @TestMetadata("delegatedVarIn.kt") public void testDelegatedVarIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarIn.kt"); doTest(fileName); } @TestMetadata("delegatedVarInterface.kt") public void testDelegatedVarInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/delegatedVarInterface.kt"); doTest(fileName); } @TestMetadata("enumEntryFor.kt") public void testEnumEntryFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryFor.kt"); doTest(fileName); } @TestMetadata("enumEntryIf.kt") public void testEnumEntryIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryIf.kt"); doTest(fileName); } @TestMetadata("enumEntryPrivate.kt") public void testEnumEntryPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryPrivate.kt"); doTest(fileName); } @TestMetadata("enumEntryProtected.kt") public void testEnumEntryProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumEntryProtected.kt"); doTest(fileName); } @TestMetadata("enumFunBreak.kt") public void testEnumFunBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunBreak.kt"); doTest(fileName); } @TestMetadata("enumFunClass.kt") public void testEnumFunClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunClass.kt"); doTest(fileName); } @TestMetadata("enumFunFunction.kt") public void testEnumFunFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunFunction.kt"); doTest(fileName); } @TestMetadata("enumFunImplements.kt") public void testEnumFunImplements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImplements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunImplements.kt"); doTest(fileName); } @TestMetadata("enumFunParamContinue.kt") public void testEnumFunParamContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamContinue.kt"); doTest(fileName); } @TestMetadata("enumFunParamDo.kt") public void testEnumFunParamDo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamDo.kt"); doTest(fileName); } @TestMetadata("enumFunParamImport.kt") public void testEnumFunParamImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamImport.kt"); doTest(fileName); } @TestMetadata("enumFunParamInstanceof.kt") public void testEnumFunParamInstanceof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumFunParamInstanceof.kt"); doTest(fileName); } @TestMetadata("enumLabelElse.kt") public void testEnumLabelElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelElse.kt"); doTest(fileName); } @TestMetadata("enumLabelFalse.kt") public void testEnumLabelFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelFalse.kt"); doTest(fileName); } @TestMetadata("enumLabelLet.kt") public void testEnumLabelLet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelLet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelLet.kt"); doTest(fileName); } @TestMetadata("enumLabelNew.kt") public void testEnumLabelNew() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelNew.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumLabelNew.kt"); doTest(fileName); } @TestMetadata("enumValEval.kt") public void testEnumValEval() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValEval.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValEval.kt"); doTest(fileName); } @TestMetadata("enumValExport.kt") public void testEnumValExport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValExport.kt"); doTest(fileName); } @TestMetadata("enumValTrue.kt") public void testEnumValTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTrue.kt"); doTest(fileName); } @TestMetadata("enumValTry.kt") public void testEnumValTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumValTry.kt"); doTest(fileName); } @TestMetadata("enumVarExtends.kt") public void testEnumVarExtends() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarExtends.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarExtends.kt"); doTest(fileName); } @TestMetadata("enumVarFinally.kt") public void testEnumVarFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarFinally.kt"); doTest(fileName); } @TestMetadata("enumVarVar.kt") public void testEnumVarVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarVar.kt"); doTest(fileName); } @TestMetadata("enumVarWhile.kt") public void testEnumVarWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/enumVarWhile.kt"); doTest(fileName); } @TestMetadata("insideClassFunArguments.kt") public void testInsideClassFunArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt"); doTest(fileName); } @TestMetadata("insideClassFunNaN.kt") public void testInsideClassFunNaN() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt"); doTest(fileName); } @TestMetadata("insideClassFunParamAwait.kt") public void testInsideClassFunParamAwait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamAwait.kt"); doTest(fileName); } @TestMetadata("insideClassFunParamCase.kt") public void testInsideClassFunParamCase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamCase.kt"); doTest(fileName); } @TestMetadata("insideClassFunParamTrue.kt") public void testInsideClassFunParamTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTrue.kt"); doTest(fileName); } @TestMetadata("insideClassFunParamTry.kt") public void testInsideClassFunParamTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunParamTry.kt"); doTest(fileName); } @TestMetadata("insideClassFunThis.kt") public void testInsideClassFunThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt"); doTest(fileName); } @TestMetadata("insideClassFunThrow.kt") public void testInsideClassFunThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt"); doTest(fileName); } @TestMetadata("insideClassLabelCatch.kt") public void testInsideClassLabelCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelCatch.kt"); doTest(fileName); } @TestMetadata("insideClassLabelConst.kt") public void testInsideClassLabelConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelConst.kt"); doTest(fileName); } @TestMetadata("insideClassLabelVar.kt") public void testInsideClassLabelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelVar.kt"); doTest(fileName); } @TestMetadata("insideClassLabelWhile.kt") public void testInsideClassLabelWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassLabelWhile.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunElse.kt") public void testInsideClassObjectFunElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunEval.kt") public void testInsideClassObjectFunEval() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunExport.kt") public void testInsideClassObjectFunExport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunFalse.kt") public void testInsideClassObjectFunFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunParamExtends.kt") public void testInsideClassObjectFunParamExtends() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamExtends.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunParamFinally.kt") public void testInsideClassObjectFunParamFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFinally.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunParamFor.kt") public void testInsideClassObjectFunParamFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamFor.kt"); doTest(fileName); } @TestMetadata("insideClassObjectFunParamIf.kt") public void testInsideClassObjectFunParamIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectFunParamIf.kt"); doTest(fileName); } @TestMetadata("insideClassObjectLabelFunction.kt") public void testInsideClassObjectLabelFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelFunction.kt"); doTest(fileName); } @TestMetadata("insideClassObjectLabelImplements.kt") public void testInsideClassObjectLabelImplements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelImplements.kt"); doTest(fileName); } @TestMetadata("insideClassObjectLabelIn.kt") public void testInsideClassObjectLabelIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelIn.kt"); doTest(fileName); } @TestMetadata("insideClassObjectLabelInterface.kt") public void testInsideClassObjectLabelInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectLabelInterface.kt"); doTest(fileName); } @TestMetadata("insideClassObjectValBreak.kt") public void testInsideClassObjectValBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValBreak.kt"); doTest(fileName); } @TestMetadata("insideClassObjectValClass.kt") public void testInsideClassObjectValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValClass.kt"); doTest(fileName); } @TestMetadata("insideClassObjectValDebugger.kt") public void testInsideClassObjectValDebugger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDebugger.kt"); doTest(fileName); } @TestMetadata("insideClassObjectValDefault.kt") public void testInsideClassObjectValDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectValDefault.kt"); doTest(fileName); } @TestMetadata("insideClassObjectVarContinue.kt") public void testInsideClassObjectVarContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarContinue.kt"); doTest(fileName); } @TestMetadata("insideClassObjectVarDelete.kt") public void testInsideClassObjectVarDelete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDelete.kt"); doTest(fileName); } @TestMetadata("insideClassObjectVarDo.kt") public void testInsideClassObjectVarDo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarDo.kt"); doTest(fileName); } @TestMetadata("insideClassObjectVarEnum.kt") public void testInsideClassObjectVarEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassObjectVarEnum.kt"); doTest(fileName); } @TestMetadata("insideClassValNull.kt") public void testInsideClassValNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValNull.kt"); doTest(fileName); } @TestMetadata("insideClassValPackage.kt") public void testInsideClassValPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValPackage.kt"); doTest(fileName); } @TestMetadata("insideClassValWith.kt") public void testInsideClassValWith() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValWith.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValWith.kt"); doTest(fileName); } @TestMetadata("insideClassValYield.kt") public void testInsideClassValYield() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValYield.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassValYield.kt"); doTest(fileName); } @TestMetadata("insideClassVarInfinity.kt") public void testInsideClassVarInfinity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarInfinity.kt"); doTest(fileName); } @TestMetadata("insideClassVarKotlin.kt") public void testInsideClassVarKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarKotlin.kt"); doTest(fileName); } @TestMetadata("insideClassVarReturn.kt") public void testInsideClassVarReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarReturn.kt"); doTest(fileName); } @TestMetadata("insideClassVarSuper.kt") public void testInsideClassVarSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideClassVarSuper.kt"); doTest(fileName); } @TestMetadata("insideObjectFunParamPublic.kt") public void testInsideObjectFunParamPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamPublic.kt"); doTest(fileName); } @TestMetadata("insideObjectFunParamStatic.kt") public void testInsideObjectFunParamStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamStatic.kt"); doTest(fileName); } @TestMetadata("insideObjectFunParamTrue.kt") public void testInsideObjectFunParamTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTrue.kt"); doTest(fileName); } @TestMetadata("insideObjectFunParamTry.kt") public void testInsideObjectFunParamTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunParamTry.kt"); doTest(fileName); } @TestMetadata("insideObjectFunPrivate.kt") public void testInsideObjectFunPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt"); doTest(fileName); } @TestMetadata("insideObjectFunProtected.kt") public void testInsideObjectFunProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt"); doTest(fileName); } @TestMetadata("insideObjectFunThis.kt") public void testInsideObjectFunThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt"); doTest(fileName); } @TestMetadata("insideObjectFunThrow.kt") public void testInsideObjectFunThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt"); doTest(fileName); } @TestMetadata("insideObjectLabelSwitch.kt") public void testInsideObjectLabelSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelSwitch.kt"); doTest(fileName); } @TestMetadata("insideObjectLabelTypeof.kt") public void testInsideObjectLabelTypeof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelTypeof.kt"); doTest(fileName); } @TestMetadata("insideObjectLabelVar.kt") public void testInsideObjectLabelVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelVar.kt"); doTest(fileName); } @TestMetadata("insideObjectLabelWhile.kt") public void testInsideObjectLabelWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectLabelWhile.kt"); doTest(fileName); } @TestMetadata("insideObjectValImport.kt") public void testInsideObjectValImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValImport.kt"); doTest(fileName); } @TestMetadata("insideObjectValInstanceof.kt") public void testInsideObjectValInstanceof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValInstanceof.kt"); doTest(fileName); } @TestMetadata("insideObjectValNull.kt") public void testInsideObjectValNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValNull.kt"); doTest(fileName); } @TestMetadata("insideObjectValPackage.kt") public void testInsideObjectValPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectValPackage.kt"); doTest(fileName); } @TestMetadata("insideObjectVarLet.kt") public void testInsideObjectVarLet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarLet.kt"); doTest(fileName); } @TestMetadata("insideObjectVarNew.kt") public void testInsideObjectVarNew() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarNew.kt"); doTest(fileName); } @TestMetadata("insideObjectVarReturn.kt") public void testInsideObjectVarReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarReturn.kt"); doTest(fileName); } @TestMetadata("insideObjectVarSuper.kt") public void testInsideObjectVarSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/insideObjectVarSuper.kt"); doTest(fileName); } @TestMetadata("localCatchIn.kt") public void testLocalCatchIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchIn.kt"); doTest(fileName); } @TestMetadata("localCatchInterface.kt") public void testLocalCatchInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchInterface.kt"); doTest(fileName); } @TestMetadata("localCatchUndefined.kt") public void testLocalCatchUndefined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchUndefined.kt"); doTest(fileName); } @TestMetadata("localCatchVoid.kt") public void testLocalCatchVoid() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchVoid.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localCatchVoid.kt"); doTest(fileName); } @TestMetadata("localFunContinue.kt") public void testLocalFunContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunContinue.kt"); doTest(fileName); } @TestMetadata("localFunDo.kt") public void testLocalFunDo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunDo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunDo.kt"); doTest(fileName); } @TestMetadata("localFunParamElse.kt") public void testLocalFunParamElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamElse.kt"); doTest(fileName); } @TestMetadata("localFunParamFalse.kt") public void testLocalFunParamFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamFalse.kt"); doTest(fileName); } @TestMetadata("localFunParamPublic.kt") public void testLocalFunParamPublic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamPublic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamPublic.kt"); doTest(fileName); } @TestMetadata("localFunParamStatic.kt") public void testLocalFunParamStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamStatic.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunParamStatic.kt"); doTest(fileName); } @TestMetadata("localFunPrivate.kt") public void testLocalFunPrivate() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunPrivate.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunPrivate.kt"); doTest(fileName); } @TestMetadata("localFunProtected.kt") public void testLocalFunProtected() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunProtected.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localFunProtected.kt"); doTest(fileName); } @TestMetadata("localLabelFor.kt") public void testLocalLabelFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelFor.kt"); doTest(fileName); } @TestMetadata("localLabelIf.kt") public void testLocalLabelIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelIf.kt"); doTest(fileName); } @TestMetadata("localLabelSwitch.kt") public void testLocalLabelSwitch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelSwitch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelSwitch.kt"); doTest(fileName); } @TestMetadata("localLabelTypeof.kt") public void testLocalLabelTypeof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localLabelTypeof.kt"); doTest(fileName); } @TestMetadata("localValImport.kt") public void testLocalValImport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValImport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValImport.kt"); doTest(fileName); } @TestMetadata("localValInstanceof.kt") public void testLocalValInstanceof() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValInstanceof.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValInstanceof.kt"); doTest(fileName); } @TestMetadata("localValVar.kt") public void testLocalValVar() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValVar.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValVar.kt"); doTest(fileName); } @TestMetadata("localValWhile.kt") public void testLocalValWhile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValWhile.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localValWhile.kt"); doTest(fileName); } @TestMetadata("localVarBreak.kt") public void testLocalVarBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarBreak.kt"); doTest(fileName); } @TestMetadata("localVarClass.kt") public void testLocalVarClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarClass.kt"); doTest(fileName); } @TestMetadata("localVarLet.kt") public void testLocalVarLet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarLet.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarLet.kt"); doTest(fileName); } @TestMetadata("localVarNew.kt") public void testLocalVarNew() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarNew.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/localVarNew.kt"); doTest(fileName); } @TestMetadata("toplevelClassDelete.kt") public void testToplevelClassDelete() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassDelete.kt"); doTest(fileName); } @TestMetadata("toplevelClassEnum.kt") public void testToplevelClassEnum() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassEnum.kt"); doTest(fileName); } @TestMetadata("toplevelClassNull.kt") public void testToplevelClassNull() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassNull.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassNull.kt"); doTest(fileName); } @TestMetadata("toplevelClassPackage.kt") public void testToplevelClassPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelClassPackage.kt"); doTest(fileName); } @TestMetadata("toplevelEnumExtends.kt") public void testToplevelEnumExtends() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumExtends.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumExtends.kt"); doTest(fileName); } @TestMetadata("toplevelEnumFinally.kt") public void testToplevelEnumFinally() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumFinally.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumFinally.kt"); doTest(fileName); } @TestMetadata("toplevelEnumThis.kt") public void testToplevelEnumThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumThis.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumThis.kt"); doTest(fileName); } @TestMetadata("toplevelEnumThrow.kt") public void testToplevelEnumThrow() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumThrow.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelEnumThrow.kt"); doTest(fileName); } @TestMetadata("toplevelFunAwait.kt") public void testToplevelFunAwait() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt"); doTest(fileName); } @TestMetadata("toplevelFunCase.kt") public void testToplevelFunCase() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt"); doTest(fileName); } @TestMetadata("toplevelFunElse.kt") public void testToplevelFunElse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt"); doTest(fileName); } @TestMetadata("toplevelFunFalse.kt") public void testToplevelFunFalse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt"); doTest(fileName); } @TestMetadata("toplevelFunParamCatch.kt") public void testToplevelFunParamCatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamCatch.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamCatch.kt"); doTest(fileName); } @TestMetadata("toplevelFunParamConst.kt") public void testToplevelFunParamConst() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamConst.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamConst.kt"); doTest(fileName); } @TestMetadata("toplevelFunParamFor.kt") public void testToplevelFunParamFor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamFor.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamFor.kt"); doTest(fileName); } @TestMetadata("toplevelFunParamIf.kt") public void testToplevelFunParamIf() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamIf.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelFunParamIf.kt"); doTest(fileName); } @TestMetadata("toplevelInterfaceEval.kt") public void testToplevelInterfaceEval() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceEval.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceEval.kt"); doTest(fileName); } @TestMetadata("toplevelInterfaceExport.kt") public void testToplevelInterfaceExport() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceExport.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceExport.kt"); doTest(fileName); } @TestMetadata("toplevelInterfaceReturn.kt") public void testToplevelInterfaceReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceReturn.kt"); doTest(fileName); } @TestMetadata("toplevelInterfaceSuper.kt") public void testToplevelInterfaceSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceSuper.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelInterfaceSuper.kt"); doTest(fileName); } @TestMetadata("toplevelLabelDebugger.kt") public void testToplevelLabelDebugger() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelDebugger.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelDebugger.kt"); doTest(fileName); } @TestMetadata("toplevelLabelDefault.kt") public void testToplevelLabelDefault() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelDefault.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelDefault.kt"); doTest(fileName); } @TestMetadata("toplevelLabelIn.kt") public void testToplevelLabelIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelIn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelIn.kt"); doTest(fileName); } @TestMetadata("toplevelLabelInterface.kt") public void testToplevelLabelInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelInterface.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelLabelInterface.kt"); doTest(fileName); } @TestMetadata("toplevelObjectFunction.kt") public void testToplevelObjectFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectFunction.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectFunction.kt"); doTest(fileName); } @TestMetadata("toplevelObjectImplements.kt") public void testToplevelObjectImplements() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectImplements.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectImplements.kt"); doTest(fileName); } @TestMetadata("toplevelObjectTrue.kt") public void testToplevelObjectTrue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectTrue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectTrue.kt"); doTest(fileName); } @TestMetadata("toplevelObjectTry.kt") public void testToplevelObjectTry() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectTry.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelObjectTry.kt"); doTest(fileName); } @TestMetadata("toplevelValBreak.kt") public void testToplevelValBreak() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValBreak.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValBreak.kt"); doTest(fileName); } @TestMetadata("toplevelValClass.kt") public void testToplevelValClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValClass.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValClass.kt"); doTest(fileName); } @TestMetadata("toplevelValInfinity.kt") public void testToplevelValInfinity() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValInfinity.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValInfinity.kt"); doTest(fileName); } @TestMetadata("toplevelValKotlin.kt") public void testToplevelValKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValKotlin.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelValKotlin.kt"); doTest(fileName); } @TestMetadata("toplevelVarArguments.kt") public void testToplevelVarArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarArguments.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarArguments.kt"); doTest(fileName); } @TestMetadata("toplevelVarContinue.kt") public void testToplevelVarContinue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarContinue.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarContinue.kt"); doTest(fileName); } @TestMetadata("toplevelVarDo.kt") public void testToplevelVarDo() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarDo.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarDo.kt"); doTest(fileName); } @TestMetadata("toplevelVarNaN.kt") public void testToplevelVarNaN() throws Exception { - String fileName = JetTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarNaN.kt"); + String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/reservedWords/cases/toplevelVarNaN.kt"); doTest(fileName); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java index 59932cf3efb..8c199e0c72e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SecondaryConstructorTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -33,125 +33,125 @@ import java.util.regex.Pattern; public class SecondaryConstructorTestGenerated extends AbstractSecondaryConstructorTest { @TestMetadata("accessToNestedObject.kt") public void ignoredAccessToNestedObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToNestedObject.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToNestedObject.kt"); doTest(fileName); } @TestMetadata("innerClasses.kt") public void ignoredInnerClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClasses.kt"); doTest(fileName); } @TestMetadata("innerClassesInheritance.kt") public void ignoredInnerClassesInheritance() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/innerClassesInheritance.kt"); doTest(fileName); } @TestMetadata("localClasses.kt") public void ignoredLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/localClasses.kt"); doTest(fileName); } @TestMetadata("withNonLocalReturn.kt") public void ignoredWithNonLocalReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withNonLocalReturn.kt"); doTest(fileName); } @TestMetadata("accessToCompanion.kt") public void testAccessToCompanion() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/accessToCompanion.kt"); doTest(fileName); } public void testAllFilesPresentInSecondaryConstructors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/secondaryConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basicNoPrimaryManySinks.kt") public void testBasicNoPrimaryManySinks() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryManySinks.kt"); doTest(fileName); } @TestMetadata("basicNoPrimaryOneSink.kt") public void testBasicNoPrimaryOneSink() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicNoPrimaryOneSink.kt"); doTest(fileName); } @TestMetadata("basicPrimary.kt") public void testBasicPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/basicPrimary.kt"); doTest(fileName); } @TestMetadata("clashingDefaultConstructors.kt") public void testClashingDefaultConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/clashingDefaultConstructors.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/clashingDefaultConstructors.kt"); doTest(fileName); } @TestMetadata("dataClasses.kt") public void testDataClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/dataClasses.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/dataClasses.kt"); doTest(fileName); } @TestMetadata("defaultArgs.kt") public void testDefaultArgs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/defaultArgs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/defaultArgs.kt"); doTest(fileName); } @TestMetadata("delegationWithPrimary.kt") public void testDelegationWithPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/delegationWithPrimary.kt"); doTest(fileName); } @TestMetadata("enums.kt") public void testEnums() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/enums.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/enums.kt"); doTest(fileName); } @TestMetadata("generics.kt") public void testGenerics() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/generics.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/generics.kt"); doTest(fileName); } @TestMetadata("superCallPrimary.kt") public void testSuperCallPrimary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallPrimary.kt"); doTest(fileName); } @TestMetadata("superCallSecondary.kt") public void testSuperCallSecondary() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallSecondary.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/superCallSecondary.kt"); doTest(fileName); } @TestMetadata("varargs.kt") public void testVarargs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/varargs.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/varargs.kt"); doTest(fileName); } @TestMetadata("withReturn.kt") public void testWithReturn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturn.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturn.kt"); doTest(fileName); } @TestMetadata("withReturnUnit.kt") public void testWithReturnUnit() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); + String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); doTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt index 491999bfb77..ec02d07fd05 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt @@ -22,7 +22,7 @@ import java.io.File import com.intellij.util.Processor import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.util.regex.Pattern import com.intellij.openapi.util.io.FileUtil import java.util.ArrayList @@ -33,11 +33,11 @@ import org.jetbrains.kotlin.codegen.CodegenTestFiles public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { private fun createAndroidAPIEnvironment(path: String) { - return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) + return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) } private fun createFakeAndroidEnvironment(path: String) { - return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK), path) + return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK), path) } private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) { @@ -96,7 +96,7 @@ public abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { myFiles = CodegenTestFiles.create( myEnvironment!!.project, ArrayUtil.toStringArray(files), - JetTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" + KotlinTestUtils.getHomeDirectory() + "/plugins/android-compiler-plugin/testData" ) blackBox(); } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt index a175c3cffd2..8278c43b04a 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt @@ -20,13 +20,13 @@ import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public abstract class AbstractAndroidBytecodeShapeTest : AbstractBytecodeTextTest() { private fun createAndroidAPIEnvironment(path: String) { - return createEnvironmentForConfiguration(JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) + return createEnvironmentForConfiguration(KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API), path) } private fun createEnvironmentForConfiguration(configuration: CompilerConfiguration, path: String) { diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index 578840cafee..1b48ed43606 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.android.synthetic.res.SyntheticFileGenerator import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import java.io.File import kotlin.test.assertEquals @@ -50,7 +50,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { for ((name, file) in expectedLayoutFiles) { val actualContents = actual[name] assertNotNull(actualContents, "File $name was not generated") - JetTestUtils.assertEqualsToFile(file, actualContents!!.contents) + KotlinTestUtils.assertEqualsToFile(file, actualContents!!.contents) } } @@ -64,7 +64,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { } private fun getEnvironment(): KotlinCoreEnvironment { - val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API) + val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.ANDROID_API) return KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) } } \ No newline at end of file diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java index 488ebffe74e..7ee45e0504e 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,48 +34,48 @@ public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest { @RunWith(JUnit3RunnerWithInners.class) public static class Android extends AbstractAndroidBoxTest { public void testAllFilesPresentInAndroid() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("fragment") public void testFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("manyWidgets") public void testManyWidgets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); doCompileAgainstAndroidSdkTest(fileName); } @TestMetadata("view") public void testView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); doCompileAgainstAndroidSdkTest(fileName); } } @@ -85,48 +85,48 @@ public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest { @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractAndroidBoxTest { public void testAllFilesPresentInInvoke() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/android"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInAttr/"); doFakeInvocationTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fqNameInTag/"); doFakeInvocationTest(fileName); } @TestMetadata("fragment") public void testFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/fragment/"); doFakeInvocationTest(fileName); } @TestMetadata("manyWidgets") public void testManyWidgets() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/manyWidgets/"); doFakeInvocationTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/multiFile/"); doFakeInvocationTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/singleFile/"); doFakeInvocationTest(fileName); } @TestMetadata("view") public void testView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/android/view/"); doFakeInvocationTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java index 38e4282978f..13910f33f90 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,132 +32,132 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeShapeTest { public void testAllFilesPresentInBytecodeShape() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/bytecodeShape"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/codegen/bytecodeShape"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("baseClass") public void testBaseClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/"); doTest(fileName); } @TestMetadata("baseClassFragment") public void testBaseClassFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/"); doTest(fileName); } @TestMetadata("clearCache") public void testClearCache() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/"); doTest(fileName); } @TestMetadata("clearCacheBaseClass") public void testClearCacheBaseClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/"); doTest(fileName); } @TestMetadata("extensionFunctions") public void testExtensionFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/"); doTest(fileName); } @TestMetadata("extensionFunctionsFragment") public void testExtensionFunctionsFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/"); doTest(fileName); } @TestMetadata("extensionFunctionsView") public void testExtensionFunctionsView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/"); doTest(fileName); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/"); doTest(fileName); } @TestMetadata("onDestroyFragment") public void testOnDestroyFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/onDestroyFragment/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/"); doTest(fileName); } @TestMetadata("simpleFragment") public void testSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/"); doTest(fileName); } @TestMetadata("simpleFragmentProperty") public void testSimpleFragmentProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragmentProperty/"); doTest(fileName); } @TestMetadata("simpleView") public void testSimpleView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/"); doTest(fileName); } @TestMetadata("supportExtensionFunctionsFragment") public void testSupportExtensionFunctionsFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportExtensionFunctionsFragment/"); doTest(fileName); } @TestMetadata("supportSimpleFragment") public void testSupportSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragment/"); doTest(fileName); } @TestMetadata("supportSimpleFragmentProperty") public void testSupportSimpleFragmentProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/supportSimpleFragmentProperty/"); doTest(fileName); } } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java index 1c456fb25a6..bb94a7c0d81 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,90 +34,90 @@ public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KCon @RunWith(JUnit3RunnerWithInners.class) public static class Simple extends AbstractAndroidXml2KConversionTest { public void testAllFilesPresentInSimple() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/simple"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("escapedLayoutName") public void testEscapedLayoutName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/escapedLayoutName/"); doTest(fileName); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/fqNameInTag/"); doTest(fileName); } @TestMetadata("layoutVariants") public void testLayoutVariants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/"); doTest(fileName); } @TestMetadata("noIds") public void testNoIds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/noIds/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/noIds/"); doTest(fileName); } @TestMetadata("sameIds") public void testSameIds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/"); doTest(fileName); } @TestMetadata("severalResDirs") public void testSeveralResDirs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/severalResDirs/"); doTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/singleFile/"); doTest(fileName); } @TestMetadata("specialTags") public void testSpecialTags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/specialTags/"); doTest(fileName); } @TestMetadata("supportSingleFile") public void testSupportSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSingleFile/"); doTest(fileName); } @TestMetadata("supportSpecialTags") public void testSupportSpecialTags() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/supportSpecialTags/"); doTest(fileName); } @TestMetadata("unresolvedFqName") public void testUnresolvedFqName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedFqName/"); doTest(fileName); } @TestMetadata("unresolvedWidget") public void testUnresolvedWidget() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/simple/unresolvedWidget/"); doTest(fileName); } } @@ -127,12 +127,12 @@ public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KCon @RunWith(JUnit3RunnerWithInners.class) public static class Exceptions extends AbstractAndroidXml2KConversionTest { public void testAllFilesPresentInExceptions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-compiler-plugin/testData/android/converter/exceptions"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("noManifest") public void testNoManifest() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/android/converter/exceptions/noManifest/"); doNoManifestTest(fileName); } } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java index fef5c122c2a..0b08d3029a8 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidCompletionTestGenerated extends AbstractAndroidCompletionTest { public void testAllFilesPresentInCompletion() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/completion"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/multiFileFragment/"); doTest(fileName); } @TestMetadata("propertiesSimple") public void testPropertiesSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimple/"); doTest(fileName); } @TestMetadata("propertiesSimpleFragment") public void testPropertiesSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleFragment/"); doTest(fileName); } @TestMetadata("propertiesSimpleView") public void testPropertiesSimpleView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/completion/propertiesSimpleView/"); doTest(fileName); } } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java index 4333baf0326..8628be602f5 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,66 +32,66 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidFindUsagesTestGenerated extends AbstractAndroidFindUsagesTest { public void testAllFilesPresentInFindUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/findUsages"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/multiFileFragment/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simple/"); doTest(fileName); } @TestMetadata("simpleFragment") public void testSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleFragment/"); doTest(fileName); } @TestMetadata("simpleView") public void testSimpleView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/simpleView/"); doTest(fileName); } @TestMetadata("wrongIdFormat") public void testWrongIdFormat() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/findUsages/wrongIdFormat/"); doTest(fileName); } } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java index 971dd91cf33..220a3d57087 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidGotoTestGenerated extends AbstractAndroidGotoTest { public void testAllFilesPresentInGoto() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/goto"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/multiFileFragment/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simple/"); doTest(fileName); } @TestMetadata("simpleFragment") public void testSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleFragment/"); doTest(fileName); } @TestMetadata("simpleView") public void testSimpleView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/goto/simpleView/"); doTest(fileName); } } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java index 30c3ac7d326..e1b57d86f80 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,60 +32,60 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidRenameTestGenerated extends AbstractAndroidRenameTest { public void testAllFilesPresentInRename() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/rename"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInAttrFragment") public void testFqNameInAttrFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInAttrFragment/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTag/"); doTest(fileName); } @TestMetadata("fqNameInTagFragment") public void testFqNameInTagFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/fqNameInTagFragment/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFile/"); doTest(fileName); } @TestMetadata("multiFileFragment") public void testMultiFileFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFileFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/multiFileFragment/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simple/"); doTest(fileName); } @TestMetadata("simpleFragment") public void testSimpleFragment() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleFragment/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleFragment/"); doTest(fileName); } @TestMetadata("simpleView") public void testSimpleView() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleView/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/rename/simpleView/"); doTest(fileName); } } diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java index bfdd7207c22..68b10bd4ee1 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java @@ -39,7 +39,7 @@ import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.io.FileFilter; @@ -83,7 +83,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { System.setProperty(KotlinAndroidTestCaseBase.SDK_PATH_PROPERTY, PathManager.getHomePath() + "/../dependencies/androidSDK"); System.setProperty(KotlinAndroidTestCaseBase.PLATFORM_DIR_PROPERTY, "android-21"); - VfsRootAccess.allowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); super.setUp(); @@ -220,7 +220,7 @@ public abstract class KotlinAndroidTestCase extends KotlinAndroidTestCaseBase { Map listeners = (Map)listenersField.get(null); listeners.clear(); - VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); myModule = null; myAdditionalModules = null; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java index 3b665e6a385..5d683e46b5b 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java @@ -35,7 +35,7 @@ import org.jetbrains.android.sdk.AndroidSdkData; import org.jetbrains.android.sdk.AndroidSdkType; import org.jetbrains.kotlin.idea.test.RunnableWithException; import org.jetbrains.kotlin.idea.test.TestUtilsKt; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -59,7 +59,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase { } public static String getPluginTestDataPathBase() { - return JetTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; + return KotlinTestUtils.getHomeDirectory() + TEST_DATA_PROJECT_RELATIVE; } public String getTestDataPath() { diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java index a117ea10fe7..e2862c69069 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,42 +32,42 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ParserResultEqualityTestGenerated extends AbstractParserResultEqualityTest { public void testAllFilesPresentInParserResultEquality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/parserResultEquality"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-idea-plugin/testData/android/parserResultEquality"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("fqNameInAttr") public void testFqNameInAttr() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInAttr/"); doTest(fileName); } @TestMetadata("fqNameInTag") public void testFqNameInTag() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/fqNameInTag/"); doTest(fileName); } @TestMetadata("multiFile") public void testMultiFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/multiFile/"); doTest(fileName); } @TestMetadata("noIds") public void testNoIds() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/noIds/"); doTest(fileName); } @TestMetadata("nolayout") public void testNolayout() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/nolayout/"); doTest(fileName); } @TestMetadata("singleFile") public void testSingleFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-idea-plugin/testData/android/parserResultEquality/singleFile/"); doTest(fileName); } } diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java index b6a81e4af23..34429317d48 100644 --- a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java +++ b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build.android; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,12 +32,12 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase { public void testAllFilesPresentInAndroid() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/"); doTest(fileName); } } diff --git a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt b/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt index 17c351695fd..ee033806d75 100644 --- a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt +++ b/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import java.io.File import java.io.StringWriter @@ -43,10 +43,10 @@ public abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() { loadFileByFullPath(fileName) CodegenTestUtil.generateFiles(myEnvironment, myFiles) - val actualAnnotations = JetTestUtils.replaceHashWithStar(collectorExtension.stringWriter.toString()) + val actualAnnotations = KotlinTestUtils.replaceHashWithStar(collectorExtension.stringWriter.toString()) val expectedAnnotationsFile = File(path + "annotations.txt") - JetTestUtils.assertEqualsToFile(expectedAnnotationsFile, actualAnnotations) + KotlinTestUtils.assertEqualsToFile(expectedAnnotationsFile, actualAnnotations) } override fun codegenTestBasePath(): String { @@ -54,7 +54,7 @@ public abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() { } private fun createTestEnvironment(supportInheritedAnnotations: Boolean): AnnotationCollectorExtensionForTests { - val configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) + val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK) val environment = KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) val project = environment.project diff --git a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java b/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java index 32982d7ac5c..40ee29d1210 100644 --- a/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java +++ b/plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AnnotationProcessorBoxTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.annotation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,84 +32,84 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class AnnotationProcessorBoxTestGenerated extends AbstractAnnotationProcessorBoxTest { public void testAllFilesPresentInCollectToFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/annotation-collector/testData/collectToFile"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/annotation-collector/testData/collectToFile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("annotatedGettersSetters") public void testAnnotatedGettersSetters() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/annotatedGettersSetters/"); doTest(fileName); } @TestMetadata("annotationInSameFile") public void testAnnotationInSameFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/annotationInSameFile/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/annotationInSameFile/"); doTest(fileName); } @TestMetadata("anonymousClasses") public void testAnonymousClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/anonymousClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/anonymousClasses/"); doTest(fileName); } @TestMetadata("classAnnotations") public void testClassAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/classAnnotations/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/classAnnotations/"); doTest(fileName); } @TestMetadata("constructors") public void testConstructors() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/constructors/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/constructors/"); doTest(fileName); } @TestMetadata("defaultPackage") public void testDefaultPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/defaultPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/defaultPackage/"); doTest(fileName); } @TestMetadata("fieldAnnotations") public void testFieldAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/fieldAnnotations/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/fieldAnnotations/"); doTest(fileName); } @TestMetadata("inheritedSimple") public void testInheritedSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/inheritedSimple/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/inheritedSimple/"); doTest(fileName); } @TestMetadata("inheritedTopLevel") public void testInheritedTopLevel() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/inheritedTopLevel/"); doTest(fileName); } @TestMetadata("localClasses") public void testLocalClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/localClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/localClasses/"); doTest(fileName); } @TestMetadata("methodAnnotations") public void testMethodAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/methodAnnotations/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/methodAnnotations/"); doTest(fileName); } @TestMetadata("nestedClasses") public void testNestedClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/nestedClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/nestedClasses/"); doTest(fileName); } @TestMetadata("platformStatic") public void testPlatformStatic() throws Exception { - String fileName = JetTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/platformStatic/"); + String fileName = KotlinTestUtils.navigationMetadata("plugins/annotation-collector/testData/collectToFile/platformStatic/"); doTest(fileName); } }